Fixed duplicate message issue