Deadlock fix to Fetch calls