Fixing new index optimization