Another change to have heat hold behave correctly in all scenarios