Fixed the tracking issue