#152 fixed paging issue.