diff --git a/hsqldb/patches/i96823.patch b/hsqldb/patches/i96823.patch
index a48f61b97af1..bea4a2b7e4f5 100644
--- a/hsqldb/patches/i96823.patch
+++ b/hsqldb/patches/i96823.patch
@@ -9,10 +9,9 @@
 +                return buf.toString();
  
              case COUNT :
--                buf.append(' ').append(Token.T_COUNT).append('(');
+                 buf.append(' ').append(Token.T_COUNT).append('(');
 -                break;
-+                buf.append(' ').append(Token.T_COUNT).append(left);
-+                return buf.toString();
++                if ( "(*)".equals(left))buf.append('*');else   buf.append(left);   buf.append(')');   return buf.toString();
  
              case SUM :
                  buf.append(' ').append(Token.T_SUM).append('(');