Pagination fix

Fixes #14