Fix Proxy Design Pattern