fix Email class