IMPORTANT: fixes heartbeat not working at all