payment-select fix