HOTFIX fixed #960