pagination hotfix