Fixed multiple mails issue