WTF???!! fix the sort