Even better handling for proxy (fixup)