proxy + client fix