Also fix issue for TOrderedSet