Fix pagination. Broken by me recently
Merge pull request #492 from rosedu/pagination

Fix pagination. Broken by me recently