Tried to fix pagination