fix for editor issues