works
Merge pull request #1365 from john-hill/SWC-3152

works