diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78b1843..2d739e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@
 
 These are the changes to each version that has been released on the official [Visual Studio extension gallery](https://marketplace.visualstudio.com/items?itemName=unchase.UnchaseODataConnectedService).
 
+## v1.3.8 `2020-01-11`
+
+- [x] Fix [issue #23](https://github.com/unchase/Unchase.Odata.Connectedservice/issues/23)
+- [x] Fix small bug: delete generation code duplicate
+
 ## v1.3.7 `2020-01-08`
 
 - [x] Fix bug for [issue #22](https://github.com/unchase/Unchase.Odata.Connectedservice/issues/22)
diff --git a/src/Unchase.OData.ConnectedService/Handler.cs b/src/Unchase.OData.ConnectedService/Handler.cs
index eb58f31..145676f 100644
--- a/src/Unchase.OData.ConnectedService/Handler.cs
+++ b/src/Unchase.OData.ConnectedService/Handler.cs
@@ -19,16 +19,6 @@ public override async Task<AddServiceInstanceResult> AddServiceInstanceAsync(Con
 
             var codeGenInstance = (Instance)context.ServiceInstance;
 
-            try
-            {
-                await GenerateCodeAsync(codeGenInstance.ServiceConfig.EdmxVersion, context);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-                throw;
-            }
-
             var codeGenDescriptor = await GenerateCodeAsync(codeGenInstance.ServiceConfig.EdmxVersion, context);
 
             codeGenInstance.ServiceConfig.FunctionImports = null;
diff --git a/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs b/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs
index 1f689da..7102ff2 100644
--- a/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs
+++ b/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.7.0")]
-[assembly: AssemblyFileVersion("1.3.7.0")]
+[assembly: AssemblyVersion("1.3.8.0")]
+[assembly: AssemblyFileVersion("1.3.8.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/src/Unchase.OData.ConnectedService/Provider.cs b/src/Unchase.OData.ConnectedService/Provider.cs
index af92c9f..380f209 100644
--- a/src/Unchase.OData.ConnectedService/Provider.cs
+++ b/src/Unchase.OData.ConnectedService/Provider.cs
@@ -29,7 +29,7 @@ public Provider()
                 BitmapSizeOptions.FromWidthAndHeight(64, 64)
             );
             CreatedBy = Constants.Author;
-            Version = new Version(1, 3, 7, 0);
+            Version = new Version(1, 3, 8, 0);
             Version = typeof(Provider).Assembly.GetName().Version;
             MoreInfoUri = new Uri(Constants.Website);
         }
diff --git a/src/Unchase.OData.ConnectedService/Wizard.cs b/src/Unchase.OData.ConnectedService/Wizard.cs
index 0eefde3..a1768a9 100644
--- a/src/Unchase.OData.ConnectedService/Wizard.cs
+++ b/src/Unchase.OData.ConnectedService/Wizard.cs
@@ -133,7 +133,7 @@ public Wizard(ConnectedServiceProviderContext context)
             {
                 if (sender is AdvancedSettingsViewModel advancedSettingsViewModel)
                 {
-                    advancedSettingsViewModel.IncludeExtensionsT4File = ConfigODataEndpointViewModel.EdmxVersion != Common.Constants.EdmxVersion4;
+                    advancedSettingsViewModel.IncludeExtensionsT4File = AdvancedSettingsViewModel.IncludeExtensionsT4File;
                     advancedSettingsViewModel.IncludeExtensionsT4FileVisibility = ConfigODataEndpointViewModel.EdmxVersion != Common.Constants.EdmxVersion4 ? Visibility.Visible : Visibility.Collapsed;
                     advancedSettingsViewModel.OperationImportsGenerator = AdvancedSettingsViewModel.OperationImportsGenerator;
                     advancedSettingsViewModel.SelectOperationImports = AdvancedSettingsViewModel.SelectOperationImports;