fix for issue #3704
unit test update for issue #3704
Merge pull request #3705 from serkan-ozal/fix/master/issue-3704

Fix/master/issue 3704