diff --git a/entry.sh b/entry.sh
index de78726..f1ff2dd 100644
--- a/entry.sh
+++ b/entry.sh
@@ -12,4 +12,4 @@ fi
 
 bash "${STEAMCMDDIR}/steamcmd.sh" +force_install_dir "$STEAMAPPDIR" +login anonymous +app_update "$STEAMAPPID" +app_update "$STEAMAPPID_TOOL" +quit
 
-bash "./launch.sh"
+exec bash "./launch.sh"
diff --git a/launch.sh b/launch.sh
index 7ddcccb..95e309b 100644
--- a/launch.sh
+++ b/launch.sh
@@ -9,8 +9,8 @@ ckpid=""
 function kill_corekeeperserver {
         if [[ ! -z "$ckpid" ]]; then
                 kill $ckpid
+                wait $ckpid
         fi
-        sleep 1
         if [[ ! -z "$xvfbpid" ]]; then
                 kill $xvfbpid
         fi