A try to fix the concurrency issue in consumer