Fix on the pagination