Remove concurrency bug