Tablesort

Fix b77a564 before merging...