#493 pagination fix