Fix index renamed bug