Made the proxy more robust