ICC-35 pagination fixed