Fix pagination on MATA-16