diff --git a/core/src/main/java/com/google/bitcoin/core/Wallet.java b/core/src/main/java/com/google/bitcoin/core/Wallet.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/google/bitcoin/core/Wallet.java
+++ b/core/src/main/java/com/google/bitcoin/core/Wallet.java
@@ -3588,6 +3588,12 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
         }
     }
 
+    @Override
+    public synchronized void setTag(String tag, ByteString value) {
+        super.setTag(tag, value);
+        saveNow();
+    }
+
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //
     // Boilerplate for running event listeners - dispatches events onto the user code thread (where we don't do
@@ -4105,10 +4111,4 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
     public ReentrantLock getLock() {
         return lock;
     }
-
-    @Override
-    public synchronized void setTag(String tag, ByteString value) {
-        super.setTag(tag, value);
-        saveNow();
-    }
 }
Wallet: move setTag to the extensions section of the file.