fixed heartbeating