Finally fixed the pagination issue...?