fixed duplicate messages