oops
Merge pull request #1148 from john-hill/SWC-1440-cr

oops