partial Revert "Revert "Additional sensors fix (Credit to Chrissi Cool)""

This reverts commit 04fb776943181e434074ab29a958a663889cd80c.