Yet another attempt at fixing the heartbeat system.