Working on paging issues. See #1442.

@rarila Does this fix the issue for you?