fix for swc-729
Merge pull request #469 from dburdick/develop

fix for swc-729