Fix sorting
merged on Sat Mar 30 14:32:50 EDT 2013