Tracking bug correction