Email fix... hopefully