Fix duplicates issue