diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
index 6dc60b16a8cc99d21d594c2d3ad9d33838d721de..ef8aacd2d7012d8da434c3778c502f7c7c9aeade 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
@@ -260,7 +260,7 @@ public class AvatarFromSysML {
                     for(int j = 0; j < tsize; j++) {
                         aa = new AvatarAttribute(
                                 a.getName() + "__" + adt.getFieldString(j),
-                                (adt.getFieldStringType(j) == AvatarType.BOOLEAN ? AvatarType.BOOLEAN : AvatarType.INTEGER),
+                                adt.getFieldStringType(j),
                                 theBlock, null);
                         theBlock.addAttribute(aa);
                         aa.setAsConstant(true);
@@ -292,7 +292,7 @@ public class AvatarFromSysML {
                     AvatarDataType adt = avSpec.getDataTypeByName(returnType);
                     int nbFields = adt.getAttributeNb();
                     for (int j = 0; j < nbFields; j++) {
-                        AvatarType type = (adt.getFieldStringType(j) == AvatarType.INTEGER ? AvatarType.INTEGER : AvatarType.BOOLEAN);
+                        AvatarType type = adt.getFieldStringType(j);
                         am.addReturnParameter(new AvatarAttribute("return__" + j, type, theBlock, null));
                     }
                 }
@@ -473,7 +473,7 @@ public class AvatarFromSysML {
                 for(int j = 0; j < tsize; j++) {
                     aa = new AvatarAttribute(
                             ss.getFieldName(i) + "__" + adt.getFieldString(j),
-                            (adt.getFieldStringType(j) == AvatarType.BOOLEAN ? AvatarType.BOOLEAN : AvatarType.INTEGER),
+                            adt.getFieldStringType(j),
                             b, null);
                     am.addParameter(aa);
                     aa.setAsConstant(false);