restore master and bug fix

fix client update/set on entry