Paginated hybrid fix