Really fix pagination