Paginator page count fix