Merge pull request #1707 from IT-Can/fix-issue-1706

Fix issue #1706