Fix to check duplicate message in handler.