Fixed concurrency problems