Fixed queuing bug