HeartBeat Fix