Fixed bug with Proxies being created twice