Re-Added fix for return of fetch