Fixed the queuing