Fixed paging issue

Closes #9