More index fixing