Fixes issue #1086.
Merge pull request #1103 from garnertb/master

Fixes issue #1086.