Fix issue related to get the payment method