Fixed the iterator hash key handling