diff --git a/src/main/java/tmltranslator/HwExecutionNode.java b/src/main/java/tmltranslator/HwExecutionNode.java
index 16098af8805007ee95c33c17759157df749ac490..2b354583e114bfce5e0a5dbf2f173081c66e532d 100755
--- a/src/main/java/tmltranslator/HwExecutionNode.java
+++ b/src/main/java/tmltranslator/HwExecutionNode.java
@@ -61,7 +61,6 @@ public abstract class HwExecutionNode extends HwNode  {
 
     public HwExecutionNode(String _name) {
         super(_name);
-
     }
 
     public abstract String getType();
diff --git a/src/main/java/tmltranslator/modelcompiler/TMLModelCompiler.java b/src/main/java/tmltranslator/modelcompiler/TMLModelCompiler.java
index 33ca9a9c99855f3763cb44e23333c07045ec66b4..cf2c3c6cca2c9a1097643ddfc1a6c1c8c9f225b2 100644
--- a/src/main/java/tmltranslator/modelcompiler/TMLModelCompiler.java
+++ b/src/main/java/tmltranslator/modelcompiler/TMLModelCompiler.java
@@ -710,6 +710,7 @@ public class TMLModelCompiler implements CCodeGenConstants {
                 outBuff = op.getOutBuffer();
                 ctxName = op.getContextName();
                 int xTaskOperationType = xTask.getOperationType();
+                TraceManager.addDev("TaskType for  task " + xTask.getTaskName() + " op: " + xTaskOperationType);
                 if (declaration) {
                     if (inBuff == null) {       //for source operation
                         buffersString.append("extern" + SP + outBuff.getType() + SP + outBuff.getName() + SC + CR);
@@ -943,6 +944,7 @@ public class TMLModelCompiler implements CCodeGenConstants {
         //TMLTask fTask =       op.getSDRTasks().get( Operation.F_TASK );
 
         int xTaskOperationType = xTask.getOperationType();
+        TraceManager.addDev("OperationType of " + xTask.getTaskName() + " = " + xTaskOperationType);
 
         if (op.getOutSignal() != null) {
             signalOutName = op.getOutSignal().getName();
diff --git a/src/main/java/ui/tmldd/TMLArchiArtifact.java b/src/main/java/ui/tmldd/TMLArchiArtifact.java
index 6ae484e6fa04d763b59c8f78d279ff38bd603bb3..59be32929358e9e2caec92fa5103c98bdbc842ee 100755
--- a/src/main/java/ui/tmldd/TMLArchiArtifact.java
+++ b/src/main/java/ui/tmldd/TMLArchiArtifact.java
@@ -356,26 +356,26 @@ public class TMLArchiArtifact extends TGCWithoutInternalComponent implements Swa
     public int getOperationType()       {
 
         if( fatherArchUnitMECType instanceof FepMEC )   {
-            if( operation.equals( "CWM" ) )     {
+            if( operationMEC.equals( "CWM" ) )     {
                 return FepOperationMEC.CWM_MEC;
             }
-            else if( operation.equals( "CWL" ) )        {
+            else if( operationMEC.equals( "CWL" ) )        {
                 //TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.CwlMEC );
                 return FepOperationMEC.CWL_MEC;
             }
-            else if( operation.equals( "CWA" ) )        {
+            else if( operationMEC.equals( "CWA" ) )        {
                 //TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.CwaMEC );
                 return FepOperationMEC.CWA_MEC;
             }
-            else if( operation.equals( "CWP" ) )        {
+            else if( operationMEC.equals( "CWP" ) )        {
                 //TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.CwpMEC );
                 return FepOperationMEC.CWP_MEC;
             }
-            else if( operation.equals( "FFT" ) )        {
+            else if( operationMEC.equals( "FFT" ) )        {
                 //TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.FftMEC );
                 return FepOperationMEC.FFT_MEC;
             }
-            else if( operation.equals( "SUM" ) )        {
+            else if( operationMEC.equals( "SUM" ) )        {
                 //TraceManager.addDev( "Operation: " + operation + " returns " + FepOperationMEC.SumMEC );
                 return FepOperationMEC.SUM_MEC;
             }
diff --git a/src/main/java/ui/window/JDialogCCodeGeneration.java b/src/main/java/ui/window/JDialogCCodeGeneration.java
index 6aacd522438dbc69a22835d122491b7b7939b922..e2a4a2f93efc211597c2869c4e99f4b607489cc5 100644
--- a/src/main/java/ui/window/JDialogCCodeGeneration.java
+++ b/src/main/java/ui/window/JDialogCCodeGeneration.java
@@ -124,6 +124,8 @@ public class JDialogCCodeGeneration extends JDialog implements ActionListener, R
     private boolean hasError = false;
     protected boolean startProcess = false;
 
+    protected static int selectedcodeGenerator = -1;
+
     private String hostSystemC;
 
     protected RshClient rshc;
@@ -228,10 +230,15 @@ public class JDialogCCodeGeneration extends JDialog implements ActionListener, R
         fillGeneratorsWithPlugins(generators);
 
         generatorsBox = new JComboBox<>(generators);
-        if (generators.size() > 1) {
-            generatorsBox.setSelectedIndex(1);
+        if (selectedcodeGenerator == -1) {
+            if (generators.size() > 1) {
+                generatorsBox.setSelectedIndex(1);
+            }
+        } else {
+            generatorsBox.setSelectedIndex(selectedcodeGenerator);
         }
 
+
         // Drawing image
         picLabel = new JLabel();
         picLabel.setHorizontalAlignment(SwingConstants.CENTER);
@@ -375,6 +382,7 @@ public class JDialogCCodeGeneration extends JDialog implements ActionListener, R
         }
         //optimizeModeSelected = optimizemode.isSelected();
         //wasClosed = true;
+        selectedcodeGenerator = generatorsBox.getSelectedIndex();
         dispose();
     }
     //