diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
index f76fc74870e..755f06b2023 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
@@ -402,9 +402,9 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         if ("int?".equals(datatype) || "long?".equals(datatype) || 
             "double?".equals(datatype) || "float?".equals(datatype)) {
             String varName = "NUMBER_" + value;
-            varName = varName.replaceAll("-", "MINUS");
-            varName = varName.replaceAll("\\+", "PLUS");
-            varName = varName.replaceAll("\\.", "DOT");
+            varName = varName.replaceAll("-", "MINUS_");
+            varName = varName.replaceAll("\\+", "PLUS_");
+            varName = varName.replaceAll("\\.", "_DOT_");
             return varName;
         }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/EnumTest.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/EnumTest.cs
index 7a5e4f5a5a0..a1fe812415d 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/EnumTest.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/EnumTest.cs
@@ -52,10 +52,30 @@ namespace IO.Swagger.Model
             NUMBER_1 = 1,
             
             /// <summary>
-            /// Enum NUMBER_MINUS1 for -1
+            /// Enum NUMBER_MINUS_1 for -1
             /// </summary>
             [EnumMember(Value = "-1")]
-            NUMBER_MINUS1 = -1
+            NUMBER_MINUS_1 = -1
+        }
+
+        /// <summary>
+        /// Gets or Sets EnumNumber
+        /// </summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public enum EnumNumberEnum
+        {
+            
+            /// <summary>
+            /// Enum NUMBER_1_DOT_1 for 1.1
+            /// </summary>
+            [EnumMember(Value = "1.1")]
+            NUMBER_1_DOT_1,
+            
+            /// <summary>
+            /// Enum NUMBER_MINUS_1_DOT_2 for -1.2
+            /// </summary>
+            [EnumMember(Value = "-1.2")]
+            NUMBER_MINUS_1_DOT_2
         }
 
     
@@ -71,6 +91,12 @@ namespace IO.Swagger.Model
         [DataMember(Name="enum_integer", EmitDefaultValue=false)]
         public EnumIntegerEnum? EnumInteger { get; set; }
     
+        /// <summary>
+        /// Gets or Sets EnumNumber
+        /// </summary>
+        [DataMember(Name="enum_number", EmitDefaultValue=false)]
+        public EnumNumberEnum? EnumNumber { get; set; }
+    
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumTest" /> class.
         /// Initializes a new instance of the <see cref="EnumTest" />class.
@@ -79,7 +105,7 @@ namespace IO.Swagger.Model
         /// <param name="EnumInteger">EnumInteger.</param>
         /// <param name="EnumNumber">EnumNumber.</param>
 
-        public EnumTest(EnumStringEnum? EnumString = null, EnumIntegerEnum? EnumInteger = null, double? EnumNumber = null)
+        public EnumTest(EnumStringEnum? EnumString = null, EnumIntegerEnum? EnumInteger = null, EnumNumberEnum? EnumNumber = null)
         {
             this.EnumString = EnumString;
             this.EnumInteger = EnumInteger;
@@ -88,12 +114,6 @@ namespace IO.Swagger.Model
         }
         
     
-        /// <summary>
-        /// Gets or Sets EnumNumber
-        /// </summary>
-        [DataMember(Name="enum_number", EmitDefaultValue=false)]
-        public double? EnumNumber { get; set; }
-    
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
index 1db4ce02fe7..3c3b0624157 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
@@ -1,27 +1,14 @@
 <Properties StartupItem="SwaggerClientTest.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/EnumClass.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs">
     <Files>
-      <File FileName="TestPet.cs" Line="23" Column="17" />
+      <File FileName="TestPet.cs" Line="1" Column="1" />
       <File FileName="TestOrder.cs" Line="1" Column="1" />
       <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/EnumTest.cs" Line="1" Column="1" />
-      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs" Line="1" Column="1" />
-      <File FileName="TestEnum.cs" Line="30" Column="36" />
-      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/EnumClass.cs" Line="31" Column="13" />
+      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs" Line="71" Column="57" />
+      <File FileName="TestEnum.cs" Line="24" Column="12" />
+      <File FileName="Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/EnumClass.cs" Line="1" Column="1" />
     </Files>
-    <Pads>
-      <Pad Id="MonoDevelop.NUnit.TestPad">
-        <State name="__root__">
-          <Node name="SwaggerClientTest" expanded="True">
-            <Node name="SwaggerClientTest" expanded="True">
-              <Node name="SwaggerClientTest" expanded="True">
-                <Node name="TestEnum" expanded="True" selected="True" />
-              </Node>
-            </Node>
-          </Node>
-        </State>
-      </Pad>
-    </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/TestEnum.cs b/samples/client/petstore/csharp/SwaggerClientTest/TestEnum.cs
index 9764536f05f..0ca6bb6c2a6 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/TestEnum.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/TestEnum.cs
@@ -28,10 +28,10 @@ namespace SwaggerClientTest.TestEnum
 			Assert.AreEqual (Newtonsoft.Json.JsonConvert.SerializeObject(EnumClass.Abc), "\"_abc\"");
 
 			// test serialization for number
-			Assert.AreEqual (Newtonsoft.Json.JsonConvert.SerializeObject(EnumTest.EnumIntegerEnum.NUMBER_MINUS1), "\"-1\"");
+			Assert.AreEqual (Newtonsoft.Json.JsonConvert.SerializeObject(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1), "\"-1\"");
 
 			// test cast to int
-			Assert.AreEqual ((int)EnumTest.EnumIntegerEnum.NUMBER_MINUS1, -1);
+			Assert.AreEqual ((int)EnumTest.EnumIntegerEnum.NUMBER_MINUS_1, -1);
 
 		}
 	}