Fix for pagination

Fix for pagination