diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
index c88fe671b4..ca51d2723e 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
@@ -1917,8 +1917,10 @@ public class JavaGenerator extends AbstractGenerator {
 
         if (scala) {
             out.println("object %s {", className);
-            out.tab(1).println("def values() : %s = %s(",
-                out.ref("scala.Array"), out.ref("scala.Array"));
+            out.tab(1).println("def values() : %s[%s] = %s(",
+                out.ref("scala.Array"),
+                className,
+                out.ref("scala.Array"));
 
             for (int i = 0; i < identifiers.size(); i++) {
                 out.tab(2).print((i > 0 ? ", " : "  "));