Fixed a last-minute bug related to CWDs.