Fix index options issue