fix-email-bug