Fixes WET issues 2661 and 2667
Merge pull request #31 from jeffdavidgordon/master

Fixes WET issues 2661 and 2667