Fix end of the fectching