Added anti duplication on message