Pagination Bug removed