Trying to fix paginator bug