Fix the index