Fixed the paging of data