Fix pagenation issue