Shipping or payment method could be invalid when cart changes (#1002)