fix fetch (?