Fix index again