Fix pagination maker