Fix index order omitted in previous commits