Fix concurrency crash