Better fix  for  Issue #37, wrong iteration in HTreeMap