Delivery method selector does not appear in some scenarios - View it on GitHub