Fix concurrency pb