Fix Tracker code