HOTFIX: Bug pagination