Fix type for iterator