diff --git a/src/pgXX/run-pgctl.py b/src/pgXX/run-pgctl.py
index 266548ec..ace5ef83 100644
--- a/src/pgXX/run-pgctl.py
+++ b/src/pgXX/run-pgctl.py
@@ -28,5 +28,6 @@
 
 util.read_env_file(pgver)
 
-cmd = pg_ctl + ' start -s -w -D "' + datadir + '" ' + '-l "' + logfile + '"'
+# Wait enough before exit
+cmd = pg_ctl + ' start -s -w -t 600 -D "' + datadir + '" ' + '-l "' + logfile + '"'
 util.system(cmd)
diff --git a/src/pgXX/start-pgXX.py b/src/pgXX/start-pgXX.py
index 8f0b53bc..e722bbc3 100644
--- a/src/pgXX/start-pgXX.py
+++ b/src/pgXX/start-pgXX.py
@@ -37,8 +37,7 @@
 if autostart == "on":
     startup.start_linux("pg" + pgver[2:4])
 else:
-    startCmd = cmd + " &"
-    subprocess.Popen(startCmd, preexec_fn=os.setpgrp(), close_fds=True, shell=True)
+    subprocess.run(cmd, preexec_fn=os.setpgrp(), close_fds=True, shell=True)
 
 isYes = os.getenv("isYes", "False")
 pgName = os.getenv("pgName", "")