Fix for email sending