fixup! fixup! support iteration on cursor