Added an extra check for payment page