Fix iterators (issue #198)