Fixing multi-editor func problems II