Fix issue #916
Merge pull request #919 from ant1/master

Fix issue #916