Fixing the mail reference