fix for PaymentImpl