Fix index location