Finally fix mailer bug