Trying to fix mailer issue 3