I believe SPHOME issue has been also fixed by my modification.