Fixing bug: shipping address (and method) set for a basket that does not require shipping