Buggy fix

Duplicate messages