Apply override fix to duplicates as well