fixed heartbeat issue