Fixed issue with paging