Fixing tracker code