Fail-safe patching