Fix Heartbeat 2/2 

Reference: https://bugzilla.redhat.com/attachment.cgi?id=883475