paginator final fix