fix client to adapt to paymentgateway change