iterator fix