Change iterator to proper type (instead of auto)