diff --git a/src/systemc/core/kernel.cc b/src/systemc/core/kernel.cc
index 5804f96..11292c4 100644
--- a/src/systemc/core/kernel.cc
+++ b/src/systemc/core/kernel.cc
@@ -82,6 +82,8 @@
         m->beforeEndOfElaboration();
     for (auto c: sc_gem5::allChannels)
         c->sc_chan()->before_end_of_elaboration();
+
+    ::sc_gem5::scheduler.elaborationDone(true);
 }
 
 void
@@ -106,8 +108,6 @@
     } catch (...) {
         ::sc_gem5::scheduler.throwToScMain();
     }
-
-    ::sc_gem5::scheduler.elaborationDone(true);
 }
 
 void