Fix index transition