Bugfix for tracking.