Fixed the cloned messages issue.