Fixed paging issue