Fixed OrderedArraySet