Pagination bug fixed #9