Fix pagination issue

Fix pagination issue