Fixed ws issue