diff --git a/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java b/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java
index 653ed20..b1ffe46 100644
--- a/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java
+++ b/DroidFish/src/org/petero/droidfish/engine/ExternalEngine.java
@@ -264,6 +264,7 @@ public class ExternalEngine extends UCIEngineBase {
         return ret;
     }
 
+    // FIXME!! Writes should be handled by separate thread.
     /** @inheritDoc */
     @Override
     public void writeLineToEngine(String data) {
diff --git a/DroidFish/src/org/petero/droidfish/engine/NetworkEngine.java b/DroidFish/src/org/petero/droidfish/engine/NetworkEngine.java
index 5993c00..faab407 100644
--- a/DroidFish/src/org/petero/droidfish/engine/NetworkEngine.java
+++ b/DroidFish/src/org/petero/droidfish/engine/NetworkEngine.java
@@ -158,7 +158,6 @@ public class NetworkEngine extends UCIEngineBase {
                         else
                             report.reportError(context.getString(R.string.engine_terminated));
                     }
-                    try { socket.close(); } catch (IOException e) {}
                 }
                 engineToGui.close();
             }
@@ -189,6 +188,7 @@ public class NetworkEngine extends UCIEngineBase {
                         report.reportError(context.getString(R.string.engine_terminated));
                     }
                     isRunning = false;
+                    try { socket.getOutputStream().write("quit\n".getBytes()); } catch (IOException e) {}
                     try { socket.close(); } catch (IOException ex) {}
                 }
             }
@@ -267,10 +267,6 @@ public class NetworkEngine extends UCIEngineBase {
         isRunning = false;
         if (startupThread != null)
             startupThread.interrupt();
-        if (socket != null) {
-            try { socket.getOutputStream().write("quit\n".getBytes()); } catch (IOException e) {}
-            try { socket.close(); } catch (IOException e) {}
-        }
         super.shutDown();
         if (stdOutThread != null)
             stdOutThread.interrupt();
diff --git a/DroidFish/src/org/petero/droidfish/engine/UCIEngine.java b/DroidFish/src/org/petero/droidfish/engine/UCIEngine.java
index e24c2fc..852e728 100644
--- a/DroidFish/src/org/petero/droidfish/engine/UCIEngine.java
+++ b/DroidFish/src/org/petero/droidfish/engine/UCIEngine.java
@@ -64,7 +64,6 @@ public interface UCIEngine {
      */
     String readLineFromEngine(int timeoutMillis);
 
-    // FIXME!! Writes should be handled by separate thread.
     /** Write a line to the engine. \n will be added automatically. */
     void writeLineToEngine(String data);