issue #328 fix pagination following