fix pagination issue in fork