fix for SWC-651