unsafe fixed upstream