HVAC bug fix