Fixing the tracker code.