Fix general iterator