Fixing issue with tracking not being applied