Fixed ALL index changes