changed order
EditableString fixes