Fix the paging ... again.