Previous commit didn't take pagination into account.