Hard fix of pagination bug, have to keep watching for the package update