Payment Gateway Fix