Fix RangeBatchIterator