fixed
Merge pull request #1241 from john-hill/SWC-1776

fixed