fix client issue