Bug Fix: Move heat_timeout variable higher