diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat
index ed8636c8bf6f..8e270204b979 100755
--- a/geode-assembly/src/main/dist/bin/gfsh.bat
+++ b/geode-assembly/src/main/dist/bin/gfsh.bat
@@ -27,7 +27,8 @@ REM
 
 setlocal enableextensions
 set scriptdir=%~dp0
-set gf=%scriptdir:\bin\=%
+REM Remove last 4 chars which are presumably "bin\"
+set gf=%scriptdir:~0,-4%
 REM echo %gf%
 REM echo %scriptdir%
 if exist "%gf%\lib\geode-dependencies.jar" goto gfok