diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java
index ebee976703..2811fcc215 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Replace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java
@@ -60,8 +60,7 @@ class Replace extends AbstractFunction<String> {
     final Field<String> getFunction0(Configuration configuration) {
         Field<?>[] args = getArguments();
 
-        // [#861] Many dialects don't ship with a single-argument replace
-        // function:
+        // [#861] Most dialects don't ship with a two-argument replace function:
         switch (configuration.getDialect()) {
             case ASE: {
                 if (args.length == 2) {
@@ -73,6 +72,7 @@ class Replace extends AbstractFunction<String> {
             }
 
             case DB2:
+            case FIREBIRD:
             case HSQLDB:
             case INGRES:
             case MYSQL:
diff --git a/jOOQ/src/main/java/org/jooq/impl/Val.java b/jOOQ/src/main/java/org/jooq/impl/Val.java
index be95442d1b..9caf2d0075 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Val.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Val.java
@@ -153,9 +153,9 @@ class Val<T> extends AbstractField<T> implements Param<T> {
                     // These dialects can hardly detect the type of a bound constant.
                     case DB2:
                     case DERBY:
+                    case FIREBIRD:
 
                     // These dialects have some trouble, when they mostly get it right.
-                    case FIREBIRD:
                     case H2:
                     case HSQLDB: