diff --git a/installJRMC b/installJRMC
index 1235ac8..78f32fe 100755
--- a/installJRMC
+++ b/installJRMC
@@ -19,7 +19,7 @@ shopt -s extglob
 declare -g SCRIPTVERSION="1.0-dev"
 declare -g BOARDURL="https://yabb.jriver.com/interact/index.php/board,80.0.html" # MC31
 declare -g DEBIANBASE="bullseye"
-declare -g MC_VERSION_HARDCODE="31.0.13"
+declare -g MC_VERSION_HARDCODE="31.0.13" # Do find all replace
 
 printHelp() {
     debug "Running: ${FUNCNAME[0]}"
@@ -1305,8 +1305,8 @@ service_jriver-mediacenter() {
 		Environment=DISPLAY=$DISPLAY
 		Environment=XAUTHORITY=$XAUTHORITY
 		ExecStart=/usr/bin/mediacenter$MC_MVERSION $*
-		KillMode=process
-		KillSignal=SIGHUP
+		KillMode=none
+		ExecStop=$MC_STUB_TARGET /MCC 20007
 		Restart=always
 		RestartSec=10
 		TimeoutStopSec=30