Fix normalization issue with tracker