fixed iterator definition