fixed
Merge pull request #1237 from john-hill/SWC-1766

fixed