replaced
boolean as well
Merge pull request #1370 from john-hill/SWC-1994

Swc 1994