Do not rely on options object for enterEditing #1