2 files changed, 3 insertions, 0 deletions
diff --git a/src/systemc/core/process.cc b/src/systemc/core/process.cc
index ec5c57cb9..39ee9e051 100644
--- a/src/systemc/core/process.cc
+++ b/src/systemc/core/process.cc
@@ -325,6 +325,8 @@ Process::satisfySensitivity(Sensitivity *s)
 void
 Process::ready()
 {
+    if (disabled())
+        return;
     if (suspended())
         _suspendedReady = true;
     else
diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc
index 085602d7b..7d2e9ef88 100644
--- a/src/systemc/core/scheduler.cc
+++ b/src/systemc/core/scheduler.cc
@@ -59,6 +59,7 @@ Scheduler::prepareForInit()
 
     for (Process *p = initList.getNext(); p; p = initList.getNext()) {
         p->finalize();
+        p->popListNode();
         p->ready();
     }