ugly left over fix, pagination