Fix hash chaining