fix issue #622
Merge pull request #627 from crate/m/order_by_fix

fix issue #622