change index order, fixes #19