Fixed Tracking bug