bug fix in client