Tracker bugfix