duplicate messages fix