Fixed issue #3626
Merge pull request #4143 from wryck7/fix/3626

Fixed issue #3626
Merge branch 'hotfix/4143'

Close #4143
Fixes #3626