Fix index design