Fix tracking code