Fixed duplicating messages