Fixed infinite queuing bug