Fix index callage