fixed bug during tracking caused by previous changes