add if for fetch when nopull