diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java
index b2028cabce..07f93619a0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java
@@ -292,10 +292,10 @@ implements
 
 
         else
-            ctx.visit(wrap(args).map((arg, i) -> applyFilter(arg, i) ? DSL.when(filter, arg == ASTERISK ? one() : arg) : arg).map(fun));
+            ctx.visit(wrap(args).map((arg, i) -> applyFilter(ctx, arg, i) ? DSL.when(filter, arg == ASTERISK ? one() : arg) : arg).map(fun));
     }
 
-    boolean applyFilter(Field<?> arg, int i) {
+    boolean applyFilter(Context<?> ctx, Field<?> arg, int i) {
         return true;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java b/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java
index 49c2737e86..354f475029 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONObjectAgg.java
@@ -181,6 +181,11 @@ implements
 
 
 
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java
index 9860f9434c..ce513bb39f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java
@@ -166,7 +166,7 @@ final class ListAgg extends AbstractAggregateFunction<String> implements UNotYet
     }
 
     @Override
-    boolean applyFilter(Field<?> arg, int i) {
+    boolean applyFilter(Context<?> ctx, Field<?> arg, int i) {
         return i == 0;
     }