Concurrent: Improve queue
Fix a remain count