Put a conditional into the gateway fix that makes sure paypal has AutoPay set to True.