diff --git a/src/comms/java/cabaletta/comms/BufferedConnection.java b/src/comms/java/cabaletta/comms/BufferedConnection.java
index b5ff35c9b..6fb079984 100644
--- a/src/comms/java/cabaletta/comms/BufferedConnection.java
+++ b/src/comms/java/cabaletta/comms/BufferedConnection.java
@@ -83,4 +83,12 @@ public class BufferedConnection implements IConnection {
         }
         return msgs;
     }
+
+    public static BufferedConnection makeBuffered(IConnection conn) {
+        if (conn instanceof BufferedConnection) {
+            return (BufferedConnection) conn;
+        } else {
+            return new BufferedConnection(conn);
+        }
+    }
 }
diff --git a/src/main/java/baritone/behavior/ControllerBehavior.java b/src/main/java/baritone/behavior/ControllerBehavior.java
index bc697f8b6..1c18bf079 100644
--- a/src/main/java/baritone/behavior/ControllerBehavior.java
+++ b/src/main/java/baritone/behavior/ControllerBehavior.java
@@ -106,11 +106,7 @@ public class ControllerBehavior extends Behavior implements IMessageListener {
 
     public void connectTo(IConnection conn) {
         disconnect();
-        if (conn instanceof BufferedConnection) {
-            this.conn = (BufferedConnection) conn;
-        } else {
-            this.conn = new BufferedConnection(conn);
-        }
+        this.conn = BufferedConnection.makeBuffered(conn);
     }
 
     public void disconnect() {