Latency fix (19/24)

Latency fix