Hack to get order_by working