Fix MFA Bug