diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
index a44aad01e1..f8ce374fb4 100644
--- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
+++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
@@ -118,7 +118,7 @@ public class BinaryProtocol implements BinaryProtocolCommands {
             }
         };
 
-        incomingData = createDataBuffer(stream, logger);
+        incomingData = IncomingDataBuffer.createDataBuffer(stream, logger);
         Runtime.getRuntime().addShutdownHook(hook);
         rpmListener = value -> {
             if (value <= COMPOSITE_OFF_RPM) {
@@ -131,12 +131,6 @@ public class BinaryProtocol implements BinaryProtocolCommands {
         };
     }
 
-    public static IncomingDataBuffer createDataBuffer(IoStream stream, Logger logger) {
-        IncomingDataBuffer incomingData = new IncomingDataBuffer(logger);
-        stream.setInputListener(incomingData::addData);
-        return incomingData;
-    }
-
     public static void sleep(int millis) {
         try {
             Thread.sleep(millis);
diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
index 9052c5babd..cddc75bf06 100644
--- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
+++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
@@ -3,6 +3,7 @@ package com.rusefi.binaryprotocol;
 import com.opensr5.Logger;
 import com.rusefi.Timeouts;
 import com.rusefi.config.generated.Fields;
+import com.rusefi.io.IoStream;
 import etch.util.CircularByteBuffer;
 import net.jcip.annotations.ThreadSafe;
 
@@ -31,6 +32,12 @@ public class IncomingDataBuffer {
         this.logger = logger;
     }
 
+    public static IncomingDataBuffer createDataBuffer(IoStream stream, Logger logger) {
+        IncomingDataBuffer incomingData = new IncomingDataBuffer(logger);
+        stream.setInputListener(incomingData::addData);
+        return incomingData;
+    }
+
     public byte[] getPacket(Logger logger, String msg, boolean allowLongResponse) throws InterruptedException, EOFException {
         return getPacket(logger, msg, allowLongResponse, System.currentTimeMillis());
     }
diff --git a/java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java b/java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
index 4757bc9acf..cbe5885cbc 100644
--- a/java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
+++ b/java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
@@ -2,7 +2,6 @@ package com.rusefi.autodetect;
 
 import com.opensr5.Logger;
 import com.rusefi.FileLog;
-import com.rusefi.binaryprotocol.BinaryProtocol;
 import com.rusefi.binaryprotocol.BinaryProtocolCommands;
 import com.rusefi.binaryprotocol.IncomingDataBuffer;
 import com.rusefi.config.generated.Fields;
@@ -40,7 +39,7 @@ public class SerialAutoChecker implements Runnable {
     public void run() {
         IoStream stream = SerialIoStreamJSerialComm.openPort(serialPort, logger);
         Logger logger = FileLog.LOGGER;
-        IncomingDataBuffer incomingData = BinaryProtocol.createDataBuffer(stream, logger);
+        IncomingDataBuffer incomingData = IncomingDataBuffer.createDataBuffer(stream, logger);
         try {
             stream.sendPacket(new byte[]{BinaryProtocolCommands.COMMAND_HELLO}, logger);
             byte[] response = incomingData.getPacket(logger, "", false);
diff --git a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
index 097f627885..56aea4ec75 100644
--- a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
+++ b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
@@ -308,7 +308,7 @@ public class ConsoleTools {
         }
         IoStream stream = SerialIoStreamJSerialComm.openPort(autoDetectedPort, FileLog.LOGGER);
         Logger logger = FileLog.LOGGER;
-        IncomingDataBuffer incomingData = BinaryProtocol.createDataBuffer(stream, logger);
+        IncomingDataBuffer incomingData = IncomingDataBuffer.createDataBuffer(stream, logger);
         byte[] commandBytes = BinaryProtocol.getTextCommandBytes("hello");
         stream.sendPacket(commandBytes, logger);
         // skipping response