WS fix