1 files changed, 1 insertions, 8 deletions
diff --git a/src/systemc/core/event.cc b/src/systemc/core/event.cc
index 097961e99..36830b308 100644
--- a/src/systemc/core/event.cc
+++ b/src/systemc/core/event.cc
@@ -49,17 +49,10 @@ Event::Event(sc_core::sc_event *_sc_event, const char *_basename_cstr) :
     _sc_event(_sc_event), _basename(_basename_cstr ? _basename_cstr : ""),
     delayedNotify([this]() { this->notify(); }), _triggeredStamp(~0ULL)
 {
-    Module *p = currentModule();
-
     if (_basename == "" && ::sc_core::sc_is_running())
         _basename = ::sc_core::sc_gen_unique_name("event");
 
-    if (p)
-        parent = p->obj()->sc_obj();
-    else if (scheduler.current())
-        parent = scheduler.current();
-    else
-        parent = nullptr;
+    parent = pickParentObj();
 
     std::string original_name = _basename;
     _basename = pickUniqueName(parent, _basename);