Fix for the sort, maybe?