- Hotfix to fix editor crash