Fix WS as per review