diff --git a/graceful-kill-java.bat b/graceful-kill-java.bat
index 4587681..c3c806f 100644
--- a/graceful-kill-java.bat
+++ b/graceful-kill-java.bat
@@ -36,7 +36,7 @@ REM WMIC PROCESS where "Name='JAVA.EXE' AND COMMANDLINE LIKE '%%NodeDaemon.poolN
 
 REM argument of 300000 will wait 5 minutes for graceful shutdown, then force kill.
 ECHO This will execute the following wmic command:
-ECHO    wmic process where "caption like 'java.exe' and commandline like '%%%1%%'" get processid
+ECHO    wmic process where "caption like 'java%%.exe' and commandline like '%%%1%%'" get processid
 ECHO Then load the agentjar in each process to start graceful shutdown.
 echo java -cp %JAVA_HOME%\lib\tools.jar;%RUNFILE% com.jda.gracefulkilljava.GracefulKill %AGENTFILE% %1 300000
 %JAVA_HOME%\bin\java -cp %JAVA_HOME%\lib\tools.jar;%RUNFILE% com.jda.gracefulkilljava.GracefulKill %AGENTFILE% %1 300000
diff --git a/src/main/java/com/jda/gracefulkilljava/GracefulKill.java b/src/main/java/com/jda/gracefulkilljava/GracefulKill.java
index 416b69a..eb836a9 100644
--- a/src/main/java/com/jda/gracefulkilljava/GracefulKill.java
+++ b/src/main/java/com/jda/gracefulkilljava/GracefulKill.java
@@ -41,7 +41,7 @@ public static void main(String[] args) throws IOException {
         HashSet<String> doNotKill = getPidForGracefulKill(output);
 
         //The PIDs for the JVMs that the user is searching for.
-        output = getProcessResults("wmic process where \"caption like 'java.exe' and commandline like '%"+commandSubstring+"%'\" get processid");
+        output = getProcessResults("wmic process where \"caption like 'java%.exe' and commandline like '%"+commandSubstring+"%'\" get processid");
         //int skip=2;
         int skip=1;
         String[] splitResults = output.split("[' ']+");