fixed concurrency bug part 2