ResolveDelta deadlock fix