Fixed tracking compability issue