diff --git a/runx b/runx
index 9ea8882..500888b 100755
--- a/runx
+++ b/runx
@@ -1,7 +1,7 @@
 #! /bin/bash
 # runx: Provide an X server in Cygwin, MSYS2 or WSL.
 
-Version="v0.4.20"
+Version="v0.4.21"
 
 usage() {                       # Usage information (--help)
   echo "runx - Run Linux GUI applications on MS Windows.
@@ -519,7 +519,7 @@ setup_cookie() {                # Generate X authentication cookie
   [ -x "$Xauthbin" ] && [ "$Winsubsystem" = "MSYS2" ] && [ ! -x /usr/X11R6/bin/xauth ] && note "If you want to use 'ssh -X' in MSYS2, you might need
   to create an executeable script /usr/X11R6/bin/xauth with the content:
 #! /bin/bash
-$(escapestring "$Xauthbin") \"$@\"
+$(escapestring "$Xauthbin") \"\$@\"
 "
 
   [ -x "$Xauthbin" ] && {
@@ -541,7 +541,7 @@ $(escapestring "$Xauthbin") \"$@\"
     rm  $Xcookie.tmp
   }
 }
-start_xserver() {               # run X
+start_xserver() {               # Run X
   check_xserver
   generate_xcommand
   [ "$Xauthentication" = "yes" ] && setup_cookie