Revert "fix sort (need refacto)"

This reverts commit f80b1d732456172cd10f7bc94c1ea06d78127bab.
Revert "Fix 68"

This reverts commit 33b76c8aa7ecd8c3f9450f4386a946063116cb06.