Fix with_queue for queue=None