Fix heartbeat