fix fetch issues