Fixing hiding issue with the payment options when you have different billing/shipping addersses