Fix block indexing.