Resolved issue of email brake