Fix index hierarchy issue