Fix the queuing