fix issue with limit and skip