Added experimental latency fix