fixed heartbeat part
after merge