Fixes deadlock related to Heartbeat-ing