Fixed duplicates in messaging. Resolved #50