Fix paging not working