#17361 - update the way duplicates are ignored