fix
refactor fetcher