Fix Duplicate Messages Issue