Hotfix on editor