Getting back Skip and Limit to work again