Early commit for editor fix