Tweak the proxy code to correctly handle the cli option.