fixed
Merge pull request #1322 from john-hill/SWC-1785

fixed