- fix client connection handling