Fix fetch for new usage