Fix Mailer issue