diff --git a/cfg/thread/nodes/subsystem.cfg b/cfg/thread/nodes/subsystem.cfg
index 40d5b48..cf19c47 100644
--- a/cfg/thread/nodes/subsystem.cfg
+++ b/cfg/thread/nodes/subsystem.cfg
@@ -4,9 +4,9 @@ ConfigFile.NumWindows: 1
 
 
 ################################################################################
-< NEW DISPLAYING WINDOW Thread: NODES subsystem of the RUNNING thread >
+< NEW DISPLAYING WINDOW Thread: NODES subsystem of the ACTIVE thread >
 ################################################################################
-window_name Thread: NODES subsystem of the RUNNING thread
+window_name Thread: NODES subsystem of the ACTIVE thread
 window_type single
 window_id 1
 window_position_x 0
@@ -38,5 +38,5 @@ window_labels_to_draw 1
 window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
 window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
 window_filter_module evt_type 1 30
-window_filter_module evt_type_label 1 "Thread: NODES subsystem of the RUNNING thread"
+window_filter_module evt_type_label 1 "Thread: NODES subsystem of the ACTIVE thread"
 
diff --git a/src/emu/nodes/setup.c b/src/emu/nodes/setup.c
index 1c5c844..7cfcb4c 100644
--- a/src/emu/nodes/setup.c
+++ b/src/emu/nodes/setup.c
@@ -58,7 +58,7 @@ static const struct model_pvt_spec pvt_spec = {
 /* ----------------- tracking ------------------ */
 
 static const int th_track[CH_MAX] = {
-	[CH_SUBSYSTEM] = TRACK_TH_RUN, /* FIXME: Why not active? */
+	[CH_SUBSYSTEM] = TRACK_TH_ACT,
 };
 
 static const int cpu_track[CH_MAX] = {