Fix-heartbeat core dump