Fix bug with network latency