diff --git a/jOOQ/src/main/java/org/jooq/InsertQuery.java b/jOOQ/src/main/java/org/jooq/InsertQuery.java
index 6a59b0b60b..ad45c3ffab 100644
--- a/jOOQ/src/main/java/org/jooq/InsertQuery.java
+++ b/jOOQ/src/main/java/org/jooq/InsertQuery.java
@@ -227,7 +227,7 @@ public interface InsertQuery<R extends Record> extends StoreQuery<R>, Insert<R>
      */
     @Override
     @Support
-    void setReturning(Identity<R, ? extends Number> identity);
+    void setReturning(Identity<R, ?> identity);
 
     /**
      * {@inheritDoc}
diff --git a/jOOQ/src/main/java/org/jooq/StoreQuery.java b/jOOQ/src/main/java/org/jooq/StoreQuery.java
index 5d66664990..22284b8f62 100644
--- a/jOOQ/src/main/java/org/jooq/StoreQuery.java
+++ b/jOOQ/src/main/java/org/jooq/StoreQuery.java
@@ -106,7 +106,7 @@ public interface StoreQuery<R extends Record> extends Query {
      * @see #getReturnedRecords()
      */
     @Support
-    void setReturning(Identity<R, ? extends Number> identity);
+    void setReturning(Identity<R, ?> identity);
 
     /**
      * Configure the <code>INSERT</code> or <code>UPDATE</code> statement to return a list of fields in
diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java
index f8da0e35c5..89df84fd69 100644
--- a/jOOQ/src/main/java/org/jooq/Table.java
+++ b/jOOQ/src/main/java/org/jooq/Table.java
@@ -133,7 +133,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * @return The table's <code>IDENTITY</code> information, or
      *         <code>null</code>, if no such information is available.
      */
-    Identity<R, ? extends Number> getIdentity();
+    Identity<R, ?> getIdentity();
     /**
      * Retrieve the table's primary key
      *
diff --git a/jOOQ/src/main/java/org/jooq/UpdateQuery.java b/jOOQ/src/main/java/org/jooq/UpdateQuery.java
index bbb12cfdcd..b75ebc1a1b 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateQuery.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateQuery.java
@@ -469,7 +469,7 @@ public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionP
      */
     @Override
     @Support({ FIREBIRD, POSTGRES })
-    void setReturning(Identity<R, ? extends Number> identity);
+    void setReturning(Identity<R, ?> identity);
 
     /**
      * {@inheritDoc}
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
index 997cb5a83f..3596f3bc29 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
@@ -103,7 +103,7 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractQuery {
     }
 
     // @Override
-    public final void setReturning(Identity<R, ? extends Number> identity) {
+    public final void setReturning(Identity<R, ?> identity) {
         if (identity != null) {
             setReturning(identity.getField());
         }
@@ -424,8 +424,8 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractQuery {
             // This shouldn't be null, as relevant dialects should
             // return empty generated keys ResultSet
             if (table.getIdentity() != null) {
-                final Field<Number> field = (Field<Number>) table.getIdentity().getField();
-                Number[] ids = new Number[values.length];
+                final Field<Object> field = (Field<Object>) table.getIdentity().getField();
+                Object[] ids = new Object[values.length];
                 for (int i = 0; i < values.length; i++) {
                     ids[i] = field.getDataType().convert(values[i]);
                 }
@@ -433,7 +433,7 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractQuery {
                 // Only the IDENTITY value was requested. No need for an
                 // additional query
                 if (returning.size() == 1 && new Fields<Record>(returning).field(field) != null) {
-                    for (final Number id : ids) {
+                    for (final Object id : ids) {
                         getReturnedRecords().add(
                         Utils.newRecord(true, table, configuration)
                              .operate(new RecordOperation<R, RuntimeException>() {
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
index 25d01f36db..50ff686009 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
@@ -274,7 +274,7 @@ abstract class AbstractTable<R extends Record> extends AbstractQueryPart impleme
      * Subclasses should override this method
      */
     @Override
-    public Identity<R, ? extends Number> getIdentity() {
+    public Identity<R, ?> getIdentity() {
         return null;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CustomTable.java b/jOOQ/src/main/java/org/jooq/impl/CustomTable.java
index 3188882f64..89a488a849 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CustomTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CustomTable.java
@@ -108,7 +108,7 @@ public abstract class CustomTable<R extends TableRecord<R>> extends TableImpl<R>
     // -------------------------------------------------------------------------
 
     @Override
-    public Identity<R, ? extends Number> getIdentity() {
+    public Identity<R, ?> getIdentity() {
         return super.getIdentity();
     }