Fix the way the heartbeat times are used