Latency fix (17/24)

Latency fix