Improved stability of new index implementation.