Fix WS issue