Fix the order by clause