Hot fix, removing frequent pagination