Corrected duplicates issue