Solve index conflict