Trying to fix mailer issue 4