fixed issue with email addresses