diff --git a/Commands/Compile & Run (with args).tmCommand b/Commands/Compile & Run (with args).tmCommand
index d56017d..abb8b63 100644
--- a/Commands/Compile & Run (with args).tmCommand	
+++ b/Commands/Compile & Run (with args).tmCommand	
@@ -3,9 +3,10 @@
 <plist version="1.0">
 <dict>
 	<key>beforeRunningCommand</key>
-	<string>saveActiveFile</string>
+	<string>nop</string>
 	<key>command</key>
-	<string>TM_JAVAMATE_GET_ARGS=1 javamate_bootstrap.sh</string>
+	<string>#!/bin/sh
+TM_JAVAMATE_GET_ARGS=1 "$TM_BUNDLE_SUPPORT/bin/javamate_bootstrap.sh"</string>
 	<key>input</key>
 	<string>document</string>
 	<key>keyEquivalent</key>
diff --git a/Commands/Compile & Run.tmCommand b/Commands/Compile & Run.tmCommand
index d65e0a5..0fd50ea 100644
--- a/Commands/Compile & Run.tmCommand	
+++ b/Commands/Compile & Run.tmCommand	
@@ -3,9 +3,10 @@
 <plist version="1.0">
 <dict>
 	<key>beforeRunningCommand</key>
-	<string>saveActiveFile</string>
+	<string>nop</string>
 	<key>command</key>
-	<string>javamate_bootstrap.sh</string>
+	<string>#!/bin/sh
+"$TM_BUNDLE_SUPPORT/bin/javamate_bootstrap.sh"</string>
 	<key>input</key>
 	<string>document</string>
 	<key>keyEquivalent</key>