Fix Paypal flow