Consistent ordering: 0_2 then 1_2; close #357