Changed timing of checking for heartbeat on #80