fixed the bug reported by Don's uswx bundle
Merge remote-tracking branch 'origin/master'