Fix: paging does not work properly