diff --git a/Dapper.Contrib.Tests/Program.cs b/Dapper.Contrib.Tests/Program.cs
index 9466276b..fe806b81 100644
--- a/Dapper.Contrib.Tests/Program.cs
+++ b/Dapper.Contrib.Tests/Program.cs
@@ -32,6 +32,7 @@ namespace Dapper.Contrib.Tests
                 connection.Open();
                 connection.Execute(@" create table Users (Id int IDENTITY(1,1) not null, Name nvarchar(100) not null, Age int not null) ");
                 connection.Execute(@" create table Automobiles (Id int IDENTITY(1,1) not null, Name nvarchar(100) not null) ");
+                connection.Execute(@" create table Results (Id int IDENTITY(1,1) not null, Name nvarchar(100) not null, [Order] int not null) ");
             }
             Console.WriteLine("Created database");
         }
diff --git a/Dapper.Contrib.Tests/Tests.cs b/Dapper.Contrib.Tests/Tests.cs
index 81201e43..c24bd54f 100644
--- a/Dapper.Contrib.Tests/Tests.cs
+++ b/Dapper.Contrib.Tests/Tests.cs
@@ -33,6 +33,14 @@ namespace Dapper.Contrib.Tests
         public string Name { get; set; }
     }
 
+    [Table("Results")]
+    public class Result
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public int Order { get; set; }
+    }
+
     public class Tests
     {
         private IDbConnection GetOpenConnection()
@@ -75,7 +83,7 @@ namespace Dapper.Contrib.Tests
         {
             using (var connection = GetOpenConnection())
             {
-                connection.Get<IUser>(3).IsNull();
+                connection.Get<User>(3).IsNull();
 
                 var id = connection.Insert(new User {Name = "Adam", Age = 10});
 
@@ -161,5 +169,17 @@ namespace Dapper.Contrib.Tests
                     throw new Exception("Query failed");
             }
         }
+
+        public void InsertFieldWithReservedName()
+        {
+            using (var conneciton = GetOpenConnection())
+            {
+                var id = conneciton.Insert(new Result() { Name = "Adam", Order = 1 });
+
+                var result = conneciton.Get<Result>(id);
+                result.Order.IsEqualTo(1);
+            }
+
+        }
     }
 }
diff --git a/Dapper.Contrib/SqlMapperExtensions.cs b/Dapper.Contrib/SqlMapperExtensions.cs
index d7b8fc2e..5ff0a3e2 100644
--- a/Dapper.Contrib/SqlMapperExtensions.cs
+++ b/Dapper.Contrib/SqlMapperExtensions.cs
@@ -180,7 +180,7 @@ namespace Dapper.Contrib.Extensions
             for (var i = 0; i < allPropertiesExceptKey.Count(); i++)
             {
                 var property = allPropertiesExceptKey.ElementAt(i);
-				sbColumnList.Append(property.Name);
+				sbColumnList.AppendFormat("[{0}]", property.Name);
                 if (i < allPropertiesExceptKey.Count() - 1)
 					sbColumnList.Append(", ");
             }