Fixed duplicate messages from different servers