latest fix to remove dupes