Fixed duplicates detection