HCOLL-97 tweaked heartbeat code