Do not rely on options object in enterEditing #2