diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
index a6f5c01f56..52e65e484c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
@@ -75,15 +75,15 @@ class BoolAnd extends Function<Boolean> {
                 break;
 
             default:
-                final Field<Integer> count = DSL.field("{0}", Integer.class, new CustomQueryPart() {
+                final Field<Integer> max = DSL.field("{0}", Integer.class, new CustomQueryPart() {
                     @Override
                     public void accept(Context<?> c) {
-                        c.visit(DSL.count(DSL.when(condition.not(), one())));
+                        c.visit(DSL.max(DSL.when(condition, zero()).otherwise(one())));
                         toSQLOverClause(c);
                     }
                 });
 
-                ctx.visit(DSL.when(count.eq(zero()), inline(true)).otherwise(inline(false)));
+                ctx.visit(DSL.when(max.eq(zero()), inline(true)).otherwise(inline(false)));
                 break;
         }
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
index 12c5e08d7a..2c5737cbc2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
@@ -75,15 +75,15 @@ class BoolOr extends Function<Boolean> {
                 break;
 
             default:
-                final Field<Integer> count = DSL.field("{0}", Integer.class, new CustomQueryPart() {
+                final Field<Integer> max = DSL.field("{0}", Integer.class, new CustomQueryPart() {
                     @Override
                     public void accept(Context<?> c) {
-                        c.visit(DSL.count(DSL.when(condition, one())));
+                        c.visit(DSL.max(DSL.when(condition, one()).otherwise(zero())));
                         toSQLOverClause(c);
                     }
                 });
 
-                ctx.visit(DSL.when(count.gt(zero()), inline(true)).otherwise(inline(false)));
+                ctx.visit(DSL.when(max.eq(one()), inline(true)).otherwise(inline(false)));
                 break;
         }
     }