fix typo, and fix client switch issue