Pagination broken in 2.4

I think it's needed just like `context` kwarg, and please let me know your opinion.