better fix for hearbeat