Trying to fix mailer issue 6