Attempt to fix mailer