Fixed proxy code