fix stupid index order