Fix iterator type