Partially fix #96 by comparing iteration numbers rather than comparing iteration objects