diff --git a/python/setup.cfg b/python/setup.cfg
index aea733ca0ff4da38b34fb8473346988b2db7a078..9ad4a3134b046d5f4c158bb34e6e3836d0a6a4d8 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = rwth-jupyter
-version = 0.0.4
+version = 0.0.6
 author = Steffen Vogel
 author_email = post@steffenvogel.de
 description = Start a RWTHjupyter instance on your machine
diff --git a/python/src/jupyter_remote_spawn/main.py b/python/src/jupyter_remote_spawn/main.py
index c533249279931ee33a7f6825eaa287dd41cd8962..9c6eb3cff4c7a61dda288ae7a4a245b82bd0279f 100644
--- a/python/src/jupyter_remote_spawn/main.py
+++ b/python/src/jupyter_remote_spawn/main.py
@@ -91,6 +91,9 @@ def main():
     chisel_fingerprint = j.get('chisel').get('fingerprint')
     jupyter_token = j.get('jupyter').get('token')
 
+    # Start jupyterhub-singleuser
+    jupyter = JupyterSingleuser(hub.username, jupyter_token, jupyter_notebook_port, jupyter_hub_port)
+
     # Establish chisel tunnel
     chisel = Chisel(cfg.jupyterhub_url+f'/user/{hub.username}/', [
             f'{sftp_port}:localhost:7777',
@@ -106,9 +109,6 @@ def main():
     if not chisel.connected.wait(timeout=10):
         raise Exception('Failed to connect to chisel server')
 
-    # Start jupyterhub-singleuser
-    jupyter = JupyterSingleuser(hub.username, jupyter_token, jupyter_notebook_port, jupyter_hub_port)
-
     # Mount RWTHjupyter home directory
     if cfg.mount:
         if cfg.rwth:
@@ -119,7 +119,7 @@ def main():
             cfg.mount_point = f'/tmp/' + getpass.getuser() + '/jupyter'
 
             if not os.path.islink(orig_mount_point):
-                os.symlink(orig_mount_point, cfg.mount_point)
+                os.symlink(cfg.mount_point, orig_mount_point)
 
         sshfs = Sshfs(cfg.mount_point, sftp_port)
         sshfs.mount()