Fix issue #896
Merge pull request #902 from Kijewski/issue-896

Fix issue #896