Fixed another iterator issue