Fix fetch functions