Fix for pagination (POT-61)