[#69] Order not work now. Fixing ORM problem