fix merge issue
Merge pull request #406 from dburdick/swc-81

fix merge issue