ws bug fix