Additional sensors fix (Credit to Chrissi Cool)