Fix issues with using the Paginator as documented in the headers. fixes #1117