fix for mailer issues