Small refinement to index_check method