final email fix