even more fetch() fixes