BUG FIX: HEARTBEAT WORKS