ClientProxy context fix