Fix set heartbeats