Fix position tracking.