Added _active handling