Bug fixe on ORDER BY