Sort on the right thing