2nd attempt to correct heating bug