#2 Pagination issue

Fix to the pagination issue