diff --git a/src/dorkbox/network/connection/ConnectionImpl.java b/src/dorkbox/network/connection/ConnectionImpl.java
index 24748ac3..7ad39b22 100644
--- a/src/dorkbox/network/connection/ConnectionImpl.java
+++ b/src/dorkbox/network/connection/ConnectionImpl.java
@@ -1040,6 +1040,6 @@ class ConnectionImpl extends ChannelInboundHandlerAdapter implements Connection_
      */
     Object fixupRmi(final Object message) {
         // "local RMI" objects have to be modified, this part does that
-        return rmiSupport.fixupRmi(this, message);
+        return rmiSupport.fixupRmi(message);
     }
 }
diff --git a/src/dorkbox/network/rmi/ConnectionNoOpSupport.java b/src/dorkbox/network/rmi/ConnectionNoOpSupport.java
index 475d38d6..0eb62441 100644
--- a/src/dorkbox/network/rmi/ConnectionNoOpSupport.java
+++ b/src/dorkbox/network/rmi/ConnectionNoOpSupport.java
@@ -42,7 +42,7 @@ class ConnectionNoOpSupport implements ConnectionRmiSupport {
     }
 
     public
-    Object fixupRmi(final ConnectionImpl connection, final Object message) {
+    Object fixupRmi(final Object message) {
         return message;
     }
 
diff --git a/src/dorkbox/network/rmi/ConnectionRmiImplSupport.java b/src/dorkbox/network/rmi/ConnectionRmiImplSupport.java
index 5e9e6506..14953311 100644
--- a/src/dorkbox/network/rmi/ConnectionRmiImplSupport.java
+++ b/src/dorkbox/network/rmi/ConnectionRmiImplSupport.java
@@ -82,8 +82,6 @@ class ConnectionRmiImplSupport implements ConnectionRmiSupport {
 
     abstract void registration(final ConnectionImpl connection, final RmiRegistration message);
 
-    abstract Object normalMessages(final Object message);
-
     public
     void close() {
         // proxy listeners are cleared in the removeAll() call (which happens BEFORE close)
@@ -393,10 +391,4 @@ class ConnectionRmiImplSupport implements ConnectionRmiSupport {
 
         return remoteObject;
     }
-
-    public
-    Object fixupRmi(final ConnectionImpl connection, final Object message) {
-        // "local RMI" objects have to be modified, this part does that
-        return normalMessages(message);
-    }
 }
diff --git a/src/dorkbox/network/rmi/ConnectionRmiLocalSupport.java b/src/dorkbox/network/rmi/ConnectionRmiLocalSupport.java
index dbaaddd3..5bc05eee 100644
--- a/src/dorkbox/network/rmi/ConnectionRmiLocalSupport.java
+++ b/src/dorkbox/network/rmi/ConnectionRmiLocalSupport.java
@@ -195,7 +195,7 @@ class ConnectionRmiLocalSupport extends ConnectionRmiImplSupport {
     @SuppressWarnings("unchecked")
     @Override
     public
-    Object normalMessages(final Object message) {
+    Object fixupRmi(final Object message) {
         // else, this was "just a local message"
 
         // because we NORMALLY pass around just the object (there is no serialization going on...) we have to explicitly check to see
diff --git a/src/dorkbox/network/rmi/ConnectionRmiNetworkSupport.java b/src/dorkbox/network/rmi/ConnectionRmiNetworkSupport.java
index 973ae14b..e8a8ffff 100644
--- a/src/dorkbox/network/rmi/ConnectionRmiNetworkSupport.java
+++ b/src/dorkbox/network/rmi/ConnectionRmiNetworkSupport.java
@@ -84,9 +84,8 @@ class ConnectionRmiNetworkSupport extends ConnectionRmiImplSupport {
         }
     }
 
-    @Override
     public
-    Object normalMessages(final Object message) {
+    Object fixupRmi(final Object message) {
         return message;
     }
 }
diff --git a/src/dorkbox/network/rmi/ConnectionRmiSupport.java b/src/dorkbox/network/rmi/ConnectionRmiSupport.java
index bb7a9ad5..3053b5e8 100644
--- a/src/dorkbox/network/rmi/ConnectionRmiSupport.java
+++ b/src/dorkbox/network/rmi/ConnectionRmiSupport.java
@@ -28,7 +28,10 @@ interface ConnectionRmiSupport {
 
     boolean manage(final ConnectionImpl connection, final Object message);
 
-    Object fixupRmi(final ConnectionImpl connection, final Object message);
+    /**
+     * "local RMI" objects have to be modified, this part does that
+     */
+    Object fixupRmi(final Object message);
 
     <T> int getRegisteredId(final T object);