re-added proxy support