diff --git a/src/OMSimulatorLib/ComponentTable.cpp b/src/OMSimulatorLib/ComponentTable.cpp
index c547eb615..d2bd35b12 100644
--- a/src/OMSimulatorLib/ComponentTable.cpp
+++ b/src/OMSimulatorLib/ComponentTable.cpp
@@ -394,7 +394,7 @@ oms_status_enu_t oms::ComponentTable::addSignalsToResults(const char* regex)
     if (x.second)
       continue;
 
-    if (regex_match(std::string(x.first), exp))
+    if (regex_match(std::string(getFullCref() + x.first), exp))
       x.second = true;
   }
 
@@ -409,7 +409,7 @@ oms_status_enu_t oms::ComponentTable::removeSignalsFromResults(const char* regex
     if (!x.second)
       continue;
 
-    if (regex_match(std::string(x.first), exp))
+    if (regex_match(std::string(getFullCref() + x.first), exp))
       x.second = false;
   }