Fix hash ordering