Bugfix of the heartbeat functionality.