Fix index dependency