More index fix