Paging now works as intended