diff --git a/jOOQ/src/main/java/org/jooq/impl/Greatest.java b/jOOQ/src/main/java/org/jooq/impl/Greatest.java
index 4217b5a4c2..a6f3c9a01f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Greatest.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Greatest.java
@@ -90,8 +90,7 @@ final class Greatest<T> extends AbstractField<T> implements MGreatest<T> {
                 Field<T> other = (Field<T>) args.get(1);
 
                 if (args.size() > 2) {
-                    Field<?>[] remaining = new Field[args.size() - 2];
-                    System.arraycopy(args, 2, remaining, 0, remaining.length);
+                    Field<?>[] remaining = args.subList(2, args.size()).toArray(Tools.EMPTY_FIELD);
 
                     ctx.visit(DSL
                        .when(first.gt(other), DSL.greatest(first, remaining))
diff --git a/jOOQ/src/main/java/org/jooq/impl/Least.java b/jOOQ/src/main/java/org/jooq/impl/Least.java
index dd9305d232..441076f35b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Least.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Least.java
@@ -89,8 +89,7 @@ final class Least<T> extends AbstractField<T> implements MLeast<T> {
                 Field<T> other = (Field<T>) args.get(1);
 
                 if (args.size() > 2) {
-                    Field<?>[] remaining = new Field<?>[args.size() - 2];
-                    System.arraycopy(args, 2, remaining, 0, remaining.length);
+                    Field<?>[] remaining = args.subList(2, args.size()).toArray(Tools.EMPTY_FIELD);
 
                     ctx.visit(DSL
                        .when(first.lt(other), DSL.least(first, remaining))