A fix to payment type setting