fixed up proxy support