Concurrency error fix