bug fixing for PaymentMethod