Fixing rework of email fix