Fix Order by (fixes #4)