Fix for WS build