fixed
Merge pull request #1244 from john-hill/SWC-1780

fixed