Fixed overwrite issue with OrderedSet