fixes in fetch