upstream fix for upnp errors