[DF-512] HashMap iterator fix.