diff --git a/RosBE-Windows/Powershell/RosBE.ps1 b/RosBE-Windows/Powershell/RosBE.ps1
index 1f4f5eb..ca69bfd 100644
--- a/RosBE-Windows/Powershell/RosBE.ps1
+++ b/RosBE-Windows/Powershell/RosBE.ps1
@@ -46,7 +46,6 @@ $global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs"
 $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386"
 $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH"
 $global:_ROSBE_ORIGINALPATH = "$_ROSBE_HOST_MINGWPATH\bin;$ENV:PATH"
-$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe"
 
 # Fix Bison package path (just in case RosBE is installed in a path which contains spaces)
 $ENV:BISON_PKGDATADIR = ((New-Object -ComObject Scripting.FileSystemObject).GetFolder("$_ROSBE_HOST_MINGWPATH\share\bison")).ShortPath
@@ -143,6 +142,8 @@ if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1") {
     & "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1"
 }
 
+$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe"
+
 if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG") {
     $ENV:ROS_RBUILDFLAGS = get-content "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG"
 }
diff --git a/RosBE-Windows/Powershell/chdefgcc.ps1 b/RosBE-Windows/Powershell/chdefgcc.ps1
index 5c02f1b..2d8c842 100644
--- a/RosBE-Windows/Powershell/chdefgcc.ps1
+++ b/RosBE-Windows/Powershell/chdefgcc.ps1
@@ -15,6 +15,7 @@ function settitle {
 
 function EOA {
     IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.ps1'"
+    $_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe"
     version
     settitle
 }
diff --git a/RosBE-Windows/Root/RosBE.cmd b/RosBE-Windows/Root/RosBE.cmd
index 3b34789..fbee0aa 100644
--- a/RosBE-Windows/Root/RosBE.cmd
+++ b/RosBE-Windows/Root/RosBE.cmd
@@ -40,7 +40,6 @@ set _ROSBE_SHOWVERSION=0
 set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386
 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH%
 set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_HOST_MINGWPATH%\bin;%PATH%
-set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe
 
 :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces)
 set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison
@@ -68,6 +67,8 @@ if exist "%APPDATA%\RosBE\rosbe-options-%1.cmd" (
     call "%APPDATA%\RosBE\rosbe-options-%1.cmd"
 )
 
+set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe
+
 if exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" (
     for /f "usebackq tokens=* delims= " %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG""`) do set ROS_RBUILDFLAGS=%%i
 )
diff --git a/RosBE-Windows/Root/chdefgcc.cmd b/RosBE-Windows/Root/chdefgcc.cmd
index f5d9e43..342e887 100644
--- a/RosBE-Windows/Root/chdefgcc.cmd
+++ b/RosBE-Windows/Root/chdefgcc.cmd
@@ -67,6 +67,7 @@ if /i "%TOOLMODE%" == "target" (
 )
 
 call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd"
+set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe
 call "%_ROSBE_BASEDIR%\version.cmd"
 
 :EOC