diff --git a/X121SMCEA/Classes/x-121.smc.market.cycle.helper.class.mq5 b/X121SMCEA/Classes/x-121.smc.market.cycle.helper.class.mq5
index 042c89d4..20c1d1b2 100644
--- a/X121SMCEA/Classes/x-121.smc.market.cycle.helper.class.mq5
+++ b/X121SMCEA/Classes/x-121.smc.market.cycle.helper.class.mq5
@@ -1233,6 +1233,9 @@ class XC121SMCCycleHelper : public XCBase
             }
         }
 
+        //
+        DetectOrderFlow();
+
         //
         return result;
     }
diff --git a/X121SMCEA/Strategy/x-121.smc.test.strategy.class.mq5 b/X121SMCEA/Strategy/x-121.smc.test.strategy.class.mq5
index d59f5240..d9966caa 100644
--- a/X121SMCEA/Strategy/x-121.smc.test.strategy.class.mq5
+++ b/X121SMCEA/Strategy/x-121.smc.test.strategy.class.mq5
@@ -477,6 +477,7 @@ class XCX121SMCTestStrategy : public XCX121SMCBaseStrategy
             Print("Pivot Detected ...");
 
             //
+            ClearDraws();
             XCXPVPivotObject *iObj;
             iObj = new XCXPVPivotObject();
             bool isCreated = iObj.Create(