Fix issue #969
Merge pull request #970 from mditzel/master

Fix issue #969