Fix the indices