Correctly order by weight.