Fix fetch issue...