Fix BlockIterator Logic