Fix for tracker_checking