added Fix Tracking