better email fix