Better detection of index changing