ws

Results 2 issues of ws

(cherry picked from commit 18874af9826977861c44b8930cae3317ad60098f)