#2321: Fix for 3+ dupes too