Client sorting fix.