3418 Change scope, add test
Merge pull request #1754 from scottsds/issue_3418_v2

3418 Change scope, add test