diff --git a/Core/Main/PTMagic.cs b/Core/Main/PTMagic.cs
index d79e993..3c5e3a8 100644
--- a/Core/Main/PTMagic.cs
+++ b/Core/Main/PTMagic.cs
@@ -1525,12 +1525,22 @@ namespace Core.Main
 
         int marketPairProcess = 1;
         Dictionary<string, List<string>> matchedMarketTriggers = new Dictionary<string, List<string>>();
+        string mainMarket = this.LastRuntimeSummary.MainMarket;
 
         // Loop through markets
         foreach (string marketPair in this.MarketList)
         {
           this.Log.DoLogDebug("'" + marketPair + "' - Checking triggers (" + marketPairProcess.ToString() + "/" + this.MarketList.Count.ToString() + ")...");
-
+          string market = marketPair.Replace(mainMarket, "");
+          switch (this.PTMagicConfiguration.GeneralSettings.Application.Exchange.ToLower())
+            {
+              case "bittrex":
+              market = market.Replace("-", "");
+              break;
+              case "poloniex":
+              market = market.Replace("-", "");
+              break;
+            }
           bool stopTriggers = false;
 
           // Loop through single market settings
@@ -1539,16 +1549,42 @@ namespace Core.Main
             List<string> matchedSingleMarketTriggers = new List<string>();
 
             // Check ignore markets
-            List<string> ignoredMarkets = SystemHelper.ConvertTokenStringToList(marketSetting.IgnoredMarkets, ",");
-            if (ignoredMarkets.Any(im => marketPair.StartsWith(im, StringComparison.InvariantCultureIgnoreCase)))
+            
+            // Strip main markets from list, if exists
+            string ignored = marketSetting.IgnoredMarkets.ToUpper();
+            ignored = ignored.Replace(mainMarket, "");
+            switch (this.PTMagicConfiguration.GeneralSettings.Application.Exchange.ToLower())
+            {
+              case "bittrex":
+              ignored = ignored.Replace("-", "");
+              break;
+              case "poloniex":
+              ignored = ignored.Replace("_", "");
+              break;
+            }
+            List<string> ignoredMarkets = SystemHelper.ConvertTokenStringToList(ignored, ",");
+            if (ignoredMarkets.Contains(market))
             {
               this.Log.DoLogDebug("'" + marketPair + "' - Is ignored in '" + marketSetting.SettingName + "'.");
               continue;
             }
 
             // Check allowed markets
-            List<string> allowedMarkets = SystemHelper.ConvertTokenStringToList(marketSetting.AllowedMarkets, ",");
-            if (allowedMarkets.Count > 0 && !allowedMarkets.Any(am => marketPair.StartsWith(am, StringComparison.InvariantCultureIgnoreCase)))
+            
+            // Strip main markets from list, if exists
+            string allowed = marketSetting.IgnoredMarkets.ToUpper();
+            allowed = allowed.Replace(mainMarket, "");
+            switch (this.PTMagicConfiguration.GeneralSettings.Application.Exchange.ToLower())
+            {
+              case "bittrex":
+              allowed = allowed.Replace("-", "");
+              break;
+              case "poloniex":
+              allowed = allowed.Replace("_", "");
+              break;
+            }
+            List<string> allowedMarkets = SystemHelper.ConvertTokenStringToList(allowed, ",");
+            if (allowedMarkets.Count > 0 && !allowedMarkets.Contains(market))
             {
               this.Log.DoLogDebug("'" + marketPair + "' - Is not allowed in '" + marketSetting.SettingName + "'.");
               continue;