payment method selection fix