bugfix in feat-eventmailer