diff --git a/build_common.xml b/build_common.xml
index fdc6a46a6..1d6aabca8 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -209,6 +209,7 @@
                     <jdkPreference>preferJre</jdkPreference>
                     <runtimeBits>64/32</runtimeBits>
                     <maxHeapPercent>${MAXHEAPSIZEPERCENT}</maxHeapPercent>
+                    <opt>-Djava.net.preferIPv4Stack=true</opt>
                 </jre>
                 <splash>
                     <file>graphics/splash.bmp</file>
@@ -516,7 +517,8 @@
 
     <target name="run" depends="build">
         <java jar="${DISTRIBUTIONDIR}/${JARFILENAME}.jar" fork="true">
-            <jvmarg value="-Xmx${MAXHEAPSIZERUN}m"/>
+            <jvmarg value="-Xmx${MAXHEAPSIZERUN}m" />
+            <jvmarg value="-Djava.net.preferIPv4Stack=true" />
             <arg line="${RUNPARAMS}" />
         </java>
     </target>
diff --git a/lib/jpproxy.jar b/lib/jpproxy.jar
index 92c28db9b..dc386eea5 100644
Binary files a/lib/jpproxy.jar and b/lib/jpproxy.jar differ
diff --git a/libsrc/jpproxy/src/com/jpexs/proxy/Server.java b/libsrc/jpproxy/src/com/jpexs/proxy/Server.java
index 00ba753a7..3f0654f3a 100644
--- a/libsrc/jpproxy/src/com/jpexs/proxy/Server.java
+++ b/libsrc/jpproxy/src/com/jpexs/proxy/Server.java
@@ -38,6 +38,7 @@ public class Server implements Runnable {
      */
     public static boolean startServer(int port, List<Replacement> replacements, List<String> catchedContentTypes, CatchedListener catchedListener, ReplacedListener replacedListener) {
         stopServer();
+        stopping = false;
         try {
             myServer = new Server(port, replacements, catchedContentTypes, catchedListener, replacedListener);
         } catch (IOException ex) {
@@ -55,6 +56,7 @@ public class Server implements Runnable {
 
     public static void stopServer() {
         if (serverRunning) {
+            stopping = true;
             serverRunning = false;
             try {
                 myServer.server.close();
diff --git a/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java b/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java
index 61f08c28e..65459d49d 100644
--- a/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java
+++ b/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java
@@ -491,8 +491,7 @@ public class ProxyFrame extends AppFrame implements ActionListener, CatchedListe
                         Logger.getLogger(ProxyFrame.class.getName()).log(Level.SEVERE, null, ex);
                     }
                 }
-                tableModel = new DefaultTableModel(0, 3);
-                replacementsTable.setModel(tableModel);
+                tableModel.setRowCount(0);                
                 reps.clear();
                 break;
             case ACTION_REMOVE:
@@ -538,8 +537,8 @@ public class ProxyFrame extends AppFrame implements ActionListener, CatchedListe
             catchedContentTypes.add("text/xml");
             catchedContentTypes.add("application/xml");
             catchedContentTypes.add("application/octet-stream");
-            if(!Server.startServer(port, Configuration.getReplacements(), catchedContentTypes, this, this)){
-                JOptionPane.showMessageDialog(this, translate("error.start.server").replace("%port%", ""+port),AppStrings.translate("error"),JOptionPane.ERROR_MESSAGE);
+            if (!Server.startServer(port, reps, catchedContentTypes, this, this)) {
+                JOptionPane.showMessageDialog(this, translate("error.start.server").replace("%port%", "" + port), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
                 started = false;
                 return;
             }