TrackerByFeatures fixed