Corrected tracking issue