fix for swc-472
Merge pull request #228 from dburdick/develop

fix for swc-472