Latency fix (22/24)

Latency fix