Fix the editor circular dependency issue