Concurrency problems fixed!