Fix issue #1689
Merge pull request #1696 from cmouse/fix-sissue-1689

Fix issue #1689