fix for issue #2721 on master branch
unit test for issue #2721 on master branch
Merge pull request #3298 from serkan-ozal/fix/master/issue-2721

Fix/master/issue 2721