Bug fix
Email sending