diff --git a/src/PSUEvent.cpp b/src/PSUEvent.cpp
index 08101de..beb5755 100644
--- a/src/PSUEvent.cpp
+++ b/src/PSUEvent.cpp
@@ -222,6 +222,7 @@
             auto foundCombine = (*combineEvent).find(eventName);
             if (foundCombine == (*combineEvent).end())
             {
+                value = newValue;
                 return;
             }
             (*combineEvent).erase(eventName);
@@ -259,6 +260,12 @@
         if (*assertState == false)
         {
             *assertState = true;
+            auto foundCombine = (*combineEvent).find(eventName);
+            if (foundCombine != (*combineEvent).end())
+            {
+                value = newValue;
+                return;
+            }
             if (!assertMessage.empty())
             {
                 // Fan Failed has two args