fixed issue 1695
Merge pull request #1703 from k77ch7/GH-1695

Fix for issue #1695