Fix latency issue