diff --git a/VERSION b/VERSION
index c946ee6..1180819 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.6
+0.1.7
diff --git a/src/main/java/io/singularitynet/Client/ClientStateMachine.java b/src/main/java/io/singularitynet/Client/ClientStateMachine.java
index 4901492..27c1713 100755
--- a/src/main/java/io/singularitynet/Client/ClientStateMachine.java
+++ b/src/main/java/io/singularitynet/Client/ClientStateMachine.java
@@ -1276,10 +1276,8 @@ public void run() {
                             }
                         });
                         // Skip all the map loading stuff and go straight to waiting for the server:
-                        episodeHasCompleted(ClientState.WAITING_FOR_SERVER_READY);
-                    } else {
-                        throw new RuntimeException("unexpected condition");
                     }
+                    episodeHasCompleted(ClientState.WAITING_FOR_SERVER_READY);
                 } else { // not needNewWorld and no world: error
                         // Mission has requested no new world, but there is no current world to play in - this is an error:
                         episodeHasCompletedWithErrors(ClientState.ERROR_NO_WORLD, "We have no world to play in - check that your ServerHandlers section contains a world generator");
@@ -1442,6 +1440,11 @@ protected void execute() throws Exception {
                 ConnectScreen.connect(parentScreen, MinecraftClient.getInstance(), srv, srvInfo, true, null);
                 this.sendToRemote = true;
             }
+
+
+            if (isConnectedToRemote && currentMissionInit().getClientRole() == 0) {
+                this.sendToRemote = true;
+            }
             /*
             if (agents.size() > 1 && currentMissionInit().getClientRole() != 0)
             {