Fix for paging issue.