another fix on duplicates