Fix iterator