Potentially fixing the pagination issue