Moved fix from editor/base-editor to core/project