Fix paging issue