Fix heartbeat monitoring issue