fix pagination issue #11