Work on proper handling of temperature sensor detection