Fix the indexes