Fix a tracker-related bug