Release 1.16
Fix sorting