Editor Fix