Make no_queue option work correctly