fixed Client bugs