fix client context