Hotfix for Mailer