Fix PaymentService