Fixes mailer issue