fix heartbeats