Fixing the paginator