Issue #29 -Fix sorting