fix client passing