Latency fix (18/24)

Latency fix