Fix 2 regressions: Explicitely disable replacing duplicates
+ use generics to avoid warnings
1 file changed