Heartbeat post fix to code