Bug fix with tracking code