Fix WS retrieval.