Try and fix pagination