Fix mixtures of tracking and non-tracking.