diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index c580e28875..465735bf2a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -10886,10 +10886,10 @@ final class ParserContext {
             if (distinct)
                 if (fields == null)
                     return countDistinct(asterisk);
-                else if (fields.length > 0)
-                    return countDistinct(fields);
-                else
+                else if (fields.length == 1)
                     return countDistinct(fields[0]);
+                else
+                    return countDistinct(fields);
             else if (fields == null)
                 return count(asterisk);
             else