Fix issue #6833
Merge pull request #7130 from dlanderson/fix_issue_6833

Fix issue #6833