Trying to fix pagination