1st attempt to correct heating bug