fix for fetch functions