Heartbeat

Category: 
bug report
Extra information: 

Combine the heartbeat with the synchronization so they can't disable each others connection. This can also be solved by using two separate connections but this would generate to much overhead.