Latency fix