Another attempt to fix concurrency crash.