fix for SWC-466