Fix for ordering bug when using .expand .orderby skip/take