fix for SWC-1450