TRying to fix mailer bug