Correct latency problem with tracker enabled