Fix concurrence problem