Fixing Proxy functionality