hotfix #3681