SQUASHME: fix iterator