New e-mail and fix to old one