Latency fix (20/24)

Latency fix