Duplicated messages fixed