Hotfix for pagination