Bugfix with Pagination