diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
index 1cfff8f6b4..aa90dd0125 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java
@@ -1328,7 +1328,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         assertEquals("YY", b1.getValue(TBook_TITLE()));
 
         // [#2982] Check if variable binding takes place correctly in this situation
-        Select<?> subquery = select(TAuthor_ID()).from(TAuthor()).where(TAuthor_LAST_NAME().eq("Orwell"));
+        Select<?> subquery = select(TAuthor_ID()).from(TAuthor()).where(TAuthor_ID().eq(1));
         assertEquals(2,
         create().update(TBook()
                     .join(subquery)
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
index 996f685d93..535ea5dd8b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
@@ -526,7 +526,11 @@ class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements
 
     @Override
     public final void bind(BindContext context) {
-        context.visit(getInto());
+        boolean declareTables = context.declareTables();
+
+        context.declareTables(true)
+               .visit(getInto())
+               .declareTables(declareTables);
 
         // A multi-row update was specified
         if (multiRow != null) {