1.6: Fix pagination being off by one page, thanks to montebianco