Hotfix #886