Pagination bug fixed