Better re-indexing check