diff --git a/Classes/x-saherelm.x121.provider.class.mq5 b/Classes/x-saherelm.x121.provider.class.mq5
index 49b8c5c0..1f36ddb3 100644
--- a/Classes/x-saherelm.x121.provider.class.mq5
+++ b/Classes/x-saherelm.x121.provider.class.mq5
@@ -1444,7 +1444,7 @@ struct X121ProviderDescriptor
         //
         for (int i = 0; i < signallersCount; i++)
         {
-            //
+            // 
             // Check all Markets for Long Conditions ...
 
             //
@@ -2005,7 +2005,7 @@ struct X121ProviderDescriptor
                 // Now Select Minimum SL ...
                 if (IsValidSize(ArraySize(sls)))
                 {
-                    slPrice = GetMin(sls);
+                    slPrice = GetAverage(sls);
                 }
 
                 //
@@ -2046,7 +2046,7 @@ struct X121ProviderDescriptor
             );
             if (mSL == 0 && mTP == 0)
             {
-                Print("Zero TP/SL ...");
+                continue;
             }
 
             //
@@ -2074,6 +2074,9 @@ struct X121ProviderDescriptor
                     iSignal,
                     this.signals //
                 );
+
+                //
+                this.provider.SetWaitsUntilNewBar(true);
             }
         }
 
diff --git a/Experts/x-test.x121ea.mq5 b/Experts/x-test.x121ea.mq5
index 046e92ca..6f5f59f6 100644
--- a/Experts/x-test.x121ea.mq5
+++ b/Experts/x-test.x121ea.mq5
@@ -213,6 +213,7 @@ bool InitialEA()
     x786Signaller.Default();
     x786Signaller.allowLong = x121EAAllowLong;
     x786Signaller.allowShort = x121EAAllowShort;
+    x786Signaller.maxAllowedOpenPositionAge = 0;
     x786Signaller.minRequiredProfitPerTrade = 0;
     x786Signaller.openNextPositionOnProfit = false;
     x786Signaller.delayBetweenTwoSameTypeSignals = 6;
@@ -223,6 +224,7 @@ bool InitialEA()
     x121Signaller.Default();
     x121Signaller.allowLong = x121EAAllowLong;
     x121Signaller.allowShort = x121EAAllowShort;
+    x121Signaller.maxAllowedOpenPositionAge = 0;
     x121Signaller.minRequiredProfitPerTrade = 0;
     x121Signaller.openNextPositionOnProfit = false;
     x121Signaller.delayBetweenTwoSameTypeSignals = 6;
@@ -233,6 +235,7 @@ bool InitialEA()
     x110Signaller.Default();
     x110Signaller.allowLong = x121EAAllowLong;
     x110Signaller.allowShort = x121EAAllowShort;
+    x110Signaller.maxAllowedOpenPositionAge = 0;
     x110Signaller.minRequiredProfitPerTrade = 0;
     x110Signaller.openNextPositionOnProfit = false;
     x110Signaller.delayBetweenTwoSameTypeSignals = 6;