diff --git a/java_console/io/src/com/rusefi/io/serial/PortHolder.java b/java_console/io/src/com/rusefi/io/serial/PortHolder.java
index 677435cf1f..0bd9176779 100644
--- a/java_console/io/src/com/rusefi/io/serial/PortHolder.java
+++ b/java_console/io/src/com/rusefi/io/serial/PortHolder.java
@@ -6,6 +6,7 @@ import com.rusefi.binaryprotocol.BinaryProtocolHolder;
 import com.rusefi.io.CommunicationLoggingHolder;
 import com.rusefi.io.ConnectionStateListener;
 import com.opensr5.io.DataListener;
+import com.rusefi.io.IoStream;
 import jssc.SerialPort;
 import jssc.SerialPortException;
 import org.jetbrains.annotations.Nullable;
@@ -17,8 +18,6 @@ import org.jetbrains.annotations.Nullable;
  * (c) Andrey Belomutskiy
  */
 public class PortHolder {
-    //    private static final int BAUD_RATE = 8 * 115200;// 921600;
-//    private static final int BAUD_RATE = 2 * 115200;
     public static int BAUD_RATE = 115200;
     private static PortHolder instance = new PortHolder();
     private final Object portLock = new Object();
@@ -29,7 +28,7 @@ public class PortHolder {
     }
 
     @Nullable
-    private SerialPort serialPort;
+    private IoStream serialPort;
 
     boolean openPort(String port, DataListener dataListener, ConnectionStateListener listener) {
         CommunicationLoggingHolder.communicationLoggingListener.onPortHolderMessage(SerialManager.class, "Opening port: " + port);
@@ -69,12 +68,13 @@ public class PortHolder {
             throw new IllegalStateException(e);
         }
 
+        SerialIoStreamJSSC stream = new SerialIoStreamJSSC(serialPort, FileLog.LOGGER);
         synchronized (portLock) {
-            this.serialPort = serialPort;
+            this.serialPort = stream;
             portLock.notifyAll();
         }
 
-        bp = BinaryProtocolHolder.create(FileLog.LOGGER, new SerialIoStreamJSSC(serialPort, FileLog.LOGGER));
+        bp = BinaryProtocolHolder.create(FileLog.LOGGER, stream);
 
         return bp.connectAndReadConfiguration(listener);
     }
@@ -93,10 +93,8 @@ public class PortHolder {
         synchronized (portLock) {
             if (serialPort != null) {
                 try {
-                    serialPort.closePort();
+                    serialPort.close();
                     serialPort = null;
-                } catch (SerialPortException e) {
-                    FileLog.MAIN.logLine("Error while closing: " + e);
                 } finally {
                     portLock.notifyAll();
                 }
diff --git a/java_console/ui/src/com/rusefi/UploadChanges.java b/java_console/ui/src/com/rusefi/UploadChanges.java
index c1db47d613..ae8b66861f 100644
--- a/java_console/ui/src/com/rusefi/UploadChanges.java
+++ b/java_console/ui/src/com/rusefi/UploadChanges.java
@@ -7,7 +7,7 @@ import com.opensr5.io.ConfigurationImageFile;
 import com.rusefi.binaryprotocol.BinaryProtocolHolder;
 import com.rusefi.io.LinkManager;
 import com.rusefi.io.serial.PortHolder;
-import com.rusefi.io.serial.SerialIoStream;
+import com.rusefi.io.serial.SerialIoStreamJSSC;
 import com.rusefi.ui.RecentCommands;
 import com.rusefi.ui.SettingsTab;
 import com.rusefi.ui.StatusWindow;
@@ -74,7 +74,7 @@ public class UploadChanges {
 
         final ConfigurationImage ci2 = ConfigurationImageFile.readFromFile("rusefi_configuration.bin");
 
-        final BinaryProtocol bp = BinaryProtocolHolder.create(logger, new SerialIoStream(serialPort, logger));
+        final BinaryProtocol bp = BinaryProtocolHolder.create(logger, new SerialIoStreamJSSC(serialPort, logger));
         bp.setController(ci1);
 
         scheduleUpload(ci2);