Fixed bug - ignoring container option from queue