Fix for the mail