Fix hash structure