iterator fixed