Fix fetch bug