Fix iteration issue #28