#224 sorting tweak