fixing cm tracking