Fix issue #971
Merge pull request #972 from mditzel/master

Fix issue #971