Possible client-side sorting fix for Bug #12001