Fixes #1242.
Merge pull request #1243 from garnertb/master

Fixes #1242.