Fix the Editor feature