Fixes issue 951.
Merge pull request #1198 from garnertb/issue_951

Fixes issue 951.