Fix concurrency error