Fix concurrency