Fixed missing optional tracking code