Try harder to avoid reindexing