diff --git a/start-socat.sh b/start-socat.sh
index 9cd8b17..213e9fd 100644
--- a/start-socat.sh
+++ b/start-socat.sh
@@ -7,12 +7,12 @@ This program comes with ABSOLUTELY NO WARRANTY; for details read "'"$(pwd)/LICEN
 This is free software, and you are welcome to redistribute it under certain conditions; read "'"$(pwd)/LICENSE.md"'" for details.
 '
 
-. $DIR/config.sh
+. "$DIR"/config.sh
 if [ "$SUUSER" != "" ]; then SUPARM='su="'"$SUUSER"'",'; fi
 
 echo "Listening at Port $PORT"
-if [ "$1" = "-d" -o "$1" = "--daemon" ]; then
-  setsid socat TCP-LISTEN:$PORT,reuseaddr,"$SUPARM"fork SYSTEM:"./main.sh" > /dev/null 2>&1 &
+if [ "$1" = "-d" ] || [ "$1" = "--daemon" ]; then
+  setsid socat TCP-LISTEN:"$PORT",reuseaddr,"$SUPARM"fork SYSTEM:"./main.sh" > /dev/null 2>&1 &
 else
-  socat TCP-LISTEN:$PORT,reuseaddr,"$SUPARM",fork SYSTEM:"./main.sh"
+  socat TCP-LISTEN:"$PORT",reuseaddr,"$SUPARM",fork SYSTEM:"./main.sh"
 fi