Fix the shuffle schemes so that they return a sorted result