Fix the concurrent issues