Concurrency bug fixed