diff --git a/include/Class/ScenarioClass.h b/include/Class/ScenarioClass.h
index ac162f3a..a1499b55 100644
--- a/include/Class/ScenarioClass.h
+++ b/include/Class/ScenarioClass.h
@@ -33,13 +33,12 @@ class Scenario {
     void calculate1() {
         _scenBlok = selectToMarker(_scenarioTmp, "end\n");
         _condition = selectToMarker(_scenBlok, "\n");
-        _conditionParam = selectFromMarkerToMarker(_condition, " ", 0);
         _eventParam = selectToMarker(eventBuf, ",");
     }
 
     bool isIncommingEventInScenario() {
         bool ret = false;
-        if (_conditionParam == _eventParam) {
+        if (_condition.indexOf(_eventParam) != -1) {
             ret = true;
         }
         return ret;
@@ -49,6 +48,8 @@ class Scenario {
         _scenarioTmp += "\n";
         _scenarioTmp.replace("\r\n", "\n");
         _scenarioTmp.replace("\r", "\n");
+
+        _conditionParam = selectFromMarkerToMarker(_condition, " ", 0);
         _conditionSign = selectFromMarkerToMarker(_condition, " ", 1);
         _conditionValue = selectFromMarkerToMarker(_condition, " ", 2);
         if (!isDigitStr(_conditionValue)) _conditionValue = jsonReadStr(configLiveJson, _conditionValue);
diff --git a/src/main.cpp b/src/main.cpp
index 745e16f2..67f91d80 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -86,6 +86,23 @@ void setup() {
 
     just_load = false;
     initialized = true;
+
+    String buf = "Geeks-for-Geeks";
+    int buf_len = buf.length() + 1;
+    char char_array[buf_len];
+    buf.toCharArray(char_array, buf_len);
+    char* token = strtok(char_array, "-");
+    while (token != NULL) {
+        printf("%s\n", token);
+        token = strtok(NULL, "-");
+    }
+
+    //char str[] = "Geeks for Geeks";
+    //char* token;
+    //char* rest = str;
+    //while ((token = strtok_r(rest, " ", &rest))) {
+    //    printf("%s\n", token);
+    //}
 }
 
 void loop() {