fix issue with heartbeat