Fixes #6766 - Pagination is failing
Merge pull request #138 from mbacovsky/6766_failing_pagination

Fixes #6766 - Pagination is failing