Duplicate messages fixed
Fixes