diff --git a/lib/codegen/fromcto/odata/odatavisitor.js b/lib/codegen/fromcto/odata/odatavisitor.js
index b3c5bc33..257df56a 100644
--- a/lib/codegen/fromcto/odata/odatavisitor.js
+++ b/lib/codegen/fromcto/odata/odatavisitor.js
@@ -238,7 +238,7 @@ class ODataVisitor {
             default:
                 argType = 'String';
             }
-            parameters.fileWriter.writeLine(4, `<Annotation Term="${decorator.getName()}${index}" ${argType}="${arg.toString()}" />`);
+            parameters.fileWriter.writeLine(4, `<Annotation Term="${decorator.getName()}${index}" ${argType}="${typeof arg === 'object' ? arg.name : arg.toString()}" />`);
         });
         return null;
     }
diff --git a/lib/common/diagramvisitor.js b/lib/common/diagramvisitor.js
index 5bdc716e..f62c744a 100644
--- a/lib/common/diagramvisitor.js
+++ b/lib/common/diagramvisitor.js
@@ -197,7 +197,6 @@ class DiagramVisitor {
      */
     visitScalarField(field, parameters) {
         this.visitField(field.getScalarField(), parameters);
-        field.getDecorators().forEach(decorator => decorator.accept(this, parameters));
     }
 
     /**
diff --git a/test/codegen/fromcto/data/model/hr.cto b/test/codegen/fromcto/data/model/hr.cto
index 4316bca3..44bc8570 100644
--- a/test/codegen/fromcto/data/model/hr.cto
+++ b/test/codegen/fromcto/data/model/hr.cto
@@ -1,3 +1,4 @@
+@category(GeneralCategory)
 namespace org.acme.hr@1.0.0
 
 import org.acme.hr.base@1.0.0.{Address, State, SSN, Time, EmployeeTShirtSizes, Level, GeneralCategory}
@@ -43,7 +44,9 @@ concept Company {
     o EmployeeSocialSecurityNumbers employeeSocialSecurityNumbers optional
 }
 
+@category(GeneralCategory)
 enum Department {
+    @category(GeneralCategory)
     o Sales
     o Marketing
     o Finance
@@ -57,6 +60,7 @@ abstract asset Equipment identified by serialNumber {
     o String serialNumber
 }
 
+@test("one")
 enum LaptopMake {
     o Apple
     o Microsoft
@@ -113,5 +117,6 @@ transaction ChangeOfAddress {
     o Address newAddress
 }
 
+@category(GeneralCategory)
 scalar KinName extends String
 scalar KinTelephone extends String
diff --git a/test/codegen/fromcto/data/model/hr_base.cto b/test/codegen/fromcto/data/model/hr_base.cto
index 5fda0782..612db130 100644
--- a/test/codegen/fromcto/data/model/hr_base.cto
+++ b/test/codegen/fromcto/data/model/hr_base.cto
@@ -1,3 +1,4 @@
+@description("hr base namespace")
 namespace org.acme.hr.base@1.0.0
 
 abstract concept Category {}