diff --git a/msys2/msys2_shell.cmd b/msys2/msys2_shell.cmd
index db240e1c9..79c054e7d 100644
--- a/msys2/msys2_shell.cmd
+++ b/msys2/msys2_shell.cmd
@@ -15,13 +15,15 @@ rem To export full current PATH from environment into MSYS2 use '-use-full-path'
 rem or uncomment next line
 rem set MSYS2_PATH_TYPE=inherit
 
-if not exist %MYPATH%msys2\etc\passwd (
-	SET PATH=%PATH%;%MYPATH%msys2\usr\bin
-	mkdir %MYPATH%msys2\tmp
-    %MYPATH%msys2\usr\bin\touch /etc/passwd
-    %MYPATH%msys2\usr\bin\touch /etc/group
-	%MYPATH%msys2\usr\bin\bash /user_setup.sh
-)
+
+SET PATH=%PATH%;%MYPATH%msys2\usr\bin
+rem /tmp is required for bash to work
+mkdir %MYPATH%msys2\tmp
+del %MYPATH%msys2\etc\passwd 
+del %MYPATH%msys2\etc\group 
+%MYPATH%msys2\usr\bin\touch /etc/passwd
+%MYPATH%msys2\usr\bin\touch /etc/group
+%MYPATH%msys2\usr\bin\bash /user_setup.sh
 
 :checkparams
 rem Help option