Fix index visit