slightly different fix for #201 that maybe won't break the mailer template