fix paging issue