Final attempt to fix pagination