fix reliance on hash ordering