Fix index conflict again