Fix the tracking. For real this time.