fix for CWS