fix Email issue