Fixing duplicates issue.