diff --git a/src/DStore.java b/src/DStore.java
index cd03957d3f9adc8c91378dd12cea8fe40c6e1c5d..70e2c7365753fe17ebd0dde99b013f573aa090a4 100644
--- a/src/DStore.java
+++ b/src/DStore.java
@@ -20,7 +20,8 @@ public class DStore {
             controller = new PrintWriter(socket.getOutputStream());
 
             //Send "JOIN port" to  controller
-            controller.write("JOIN "+port);
+            controller.println("JOIN "+port);
+            controller.flush();
 
             //New thread to listen for "LIST" & "REMOVE FILENAME"
             new Thread(() -> {
@@ -105,7 +106,8 @@ public class DStore {
         }
 
         //Return value
-        controller.write(stringList.toString());
+        controller.println(stringList);
+        controller.flush();
     }
 
     private static void removeFile(String filePath, String fileName){
diff --git a/src/StoreThread.java b/src/StoreThread.java
index acf853c696caf94a9f75c2b51a77fd359e0f59b4..e9938b51f0d3bf1c38130768d7e7190840ae1608 100644
--- a/src/StoreThread.java
+++ b/src/StoreThread.java
@@ -36,7 +36,8 @@ public class StoreThread implements Runnable{
             fileOutput.write(buf);
 
             //Send completion ack to controller
-            controller.write("STORE_ACK "+fileName);
+            controller.println("STORE_ACK "+fileName);
+            controller.flush();
 
             //Close file output
             fileOutput.close();