Fix #916
Merge pull request #917 from dpen2000/patch-2

Fix #916