1 files changed, 3 insertions, 3 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index 7f7a5d0..8cc37fe 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -60,7 +60,7 @@ public class SameController {
         ServerContainer server = new ServerBuilder(port)
         .withServlet(new StateServlet(client.getInterface()), "/_/state")
         .withService(client.getService(), ClientService.class)
-        .withService(master, MasterService.class)
+        .withService(master.getService(), MasterService.class)
         .withService(paxos, PaxosService.class)
         .build();
         
@@ -116,12 +116,12 @@ public class SameController {
     public void join() {
         try {
             server.join();
-            master.join();
+            client.interrupt();
+            master.interrupt();
             if (discoveryService != null) {
                 discoveryService.join();
             }
         } catch (InterruptedException e) {
-            master.interrupt();
             try {
                 server.stop();
             } catch (Exception e1) {