Fix the pagination fix