issue #21359: Swat.
Merge pull request #42 from jrogelstad/21359

issue #21359: Swat.