fix another ordering issues, use array instead of unordered set