fix in DWC generator