Fix the rest of the indices