BoT-Concern fix for issue 1835
BoT-Concern fix for issue 1835 redux
Merge pull request #1066 from scottsds/issue_1835_BoTFIX

Issue 1835 botfix