Fix the queue concurrency issue