Fix TrackerByFeatures