Fix pagination issue

Fix pagination issue
Merge pull request #162 from AlexAlexandru/master

[merge] Fix pagination issue