diff --git a/Dapper NET40/SqlMapper.cs b/Dapper NET40/SqlMapper.cs
index 24c78f6d81185bec555f20158f4cda0a23f8e2f0..790d13581049b8a9226b83ea90ebd9f131f5b0c6 100644
--- a/Dapper NET40/SqlMapper.cs	
+++ b/Dapper NET40/SqlMapper.cs	
@@ -1833,7 +1833,7 @@ public static void PackListParameters(IDbCommand command, string namePrefix, obj
 
         private static IEnumerable<PropertyInfo> FilterParameters(IEnumerable<PropertyInfo> parameters, string sql)
         {
-            return parameters.Where(p => Regex.IsMatch(sql, @"[?@:]" + p.Name + "([^a-zA-Z0-9_]+|$)", RegexOptions.IgnoreCase | RegexOptions.Multiline));
+            return parameters.Where(p => Regex.IsMatch(sql, @"[?@:]" + p.Name + "([^a-zA-Z0-9_]+|$)", RegexOptions.IgnoreCase | RegexOptions.Multiline | RegexOptions.CultureInvariant));
         }
 
 
@@ -1924,15 +1924,6 @@ private static IEnumerable<PropertyInfo> FilterParameters(IEnumerable<PropertyIn
 
             foreach (var prop in props)
             {
-                if (filterParams)
-                {
-                    if (identity.sql.IndexOf("@" + prop.Name, StringComparison.InvariantCultureIgnoreCase) < 0
-                        && identity.sql.IndexOf(":" + prop.Name, StringComparison.InvariantCultureIgnoreCase) < 0
-                        && identity.sql.IndexOf("?" + prop.Name, StringComparison.InvariantCultureIgnoreCase) < 0)
-                    { // can't see the parameter in the text (even in a comment, etc) - burn it with fire
-                        continue;
-                    }
-                }
                 if (typeof(ICustomQueryParameter).IsAssignableFrom(prop.PropertyType))
                 {
                     il.Emit(OpCodes.Ldloc_0); // stack is now [parameters] [typed-param]
diff --git a/Tests/Tests.cs b/Tests/Tests.cs
index 00fda1b8626a15d4846751cb888ba84da7f9e308..cacf7e1d6f5e44b3f167fccf6498bfd47813d699 100644
--- a/Tests/Tests.cs
+++ b/Tests/Tests.cs
@@ -13,6 +13,8 @@
 using System.ComponentModel;
 using Microsoft.CSharp.RuntimeBinder;
 using System.Data.Common;
+using System.Globalization;
+using System.Threading;
 #if POSTGRESQL
 using Npgsql;
 #endif
@@ -2637,6 +2639,16 @@ public void TestDoubleDecimalConversions_SO18228523_Nulls()
             row.D.IsNull();
         }
 
+        public void TestParameterInclusionNotSensitiveToCurrentCulture()
+        {
+            CultureInfo current = Thread.CurrentThread.CurrentCulture;
+            Thread.CurrentThread.CurrentCulture = new CultureInfo("tr-TR");
+
+            connection.Query<int>("select @pid", new { PId = 1 }).Single();
+
+            Thread.CurrentThread.CurrentCulture = current;
+        }
+
         class HasDoubleDecimal
         {
             public double A { get; set; }