Hot fix for editor