captured last attempt to avoid deadlock before merging to v1.62-rpc