diff --git a/src/java-jpa-entity.js b/src/java-jpa-entity.js
index fc82cc3..389b355 100644
--- a/src/java-jpa-entity.js
+++ b/src/java-jpa-entity.js
@@ -14,7 +14,7 @@ module.exports = {
                 field.name = utils.camelcase(field.name)
                 field.type = javaType.mapJavaType(field.type, namespace)
 
-                if(field.type.fullQualifiedName.includes('model')) {
+                if(field.type.fullQualifiedName && field.type.fullQualifiedName.includes('model') && !field.type.isEnum) {
                     field.type.fullQualifiedName = field.type.fullQualifiedName.replace('model', 'db') + 'Entity'
                     field.type.name = field.type.name + "Entity";
                 }
diff --git a/templates/jpa-entity.java.mustache b/templates/jpa-entity.java.mustache
index 796e9b2..c5d0c27 100644
--- a/templates/jpa-entity.java.mustache
+++ b/templates/jpa-entity.java.mustache
@@ -24,7 +24,7 @@ import {{{.}}};
 @Entity
 @Data
 @Table(
-    name = "{{table}}"{{#indexes}},{{/indexes}}
+    name = "{{table}}",
     indexes = {
         {{#indexes}}
             @Index(columnList = "{{.}}"),