Card #278: fix for pagination