Fix ordering of index