fixed internal iterator references