Fix: Pagination defect