Index: benchmark/Makefile.am
===================================================================
--- benchmark/Makefile.am	(revision e23542987c42024e758269c7930ff52bdaf97f78)
+++ benchmark/Makefile.am	(revision 0d72d45ea31cbbd475ba7bfbaaa64af872033517)
@@ -291,15 +291,15 @@
 ctxswitch-python_coroutine$(EXEEXT):
 	$(BENCH_V_PY)echo "#!/bin/sh" > a.out
-	echo "python3.7 $(srcdir)/ctxswitch/python_cor.py" >> a.out
+	echo "python3 $(srcdir)/ctxswitch/python_cor.py \"$$""@\"" >> a.out
 	chmod a+x a.out
 
 ctxswitch-nodejs_coroutine$(EXEEXT):
 	$(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
-	echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
+	echo "nodejs $(srcdir)/ctxswitch/node_cor.js \"$$""@\"" >> a.out
 	chmod a+x a.out
 
 ctxswitch-nodejs_await$(EXEEXT):
 	$(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
-	echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
+	echo "nodejs $(srcdir)/ctxswitch/node_await.js \"$$""@\"" >> a.out
 	chmod a+x a.out
 
@@ -313,5 +313,5 @@
 	$(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
 	echo "#!/bin/sh" > a.out
-	echo "java JavaThread" >> a.out
+	echo "java JavaThread \"$$""@\"" >> a.out
 	chmod a+x a.out
 
@@ -355,5 +355,5 @@
 	$(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
 	echo "#!/bin/sh" > a.out
-	echo "java JavaThread" >> a.out
+	echo "java JavaThread \"$$""@\"" >> a.out
 	chmod a+x a.out
 
@@ -387,5 +387,5 @@
 	$(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
 	echo "#!/bin/sh" > a.out
-	echo "java JavaThread" >> a.out
+	echo "java JavaThread \"$$""@\"" >> a.out
 	chmod a+x a.out
 
@@ -454,10 +454,10 @@
 creation-python_coroutine$(EXEEXT):
 	$(BENCH_V_PY)echo "#!/bin/sh" > a.out
-	echo "python3.7 $(srcdir)/creation/python_cor.py" >> a.out
+	echo "python3 $(srcdir)/creation/python_cor.py \"$$""@\"" >> a.out
 	chmod a+x a.out
 
 creation-nodejs_coroutine$(EXEEXT):
 	$(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
-	echo "nodejs $(srcdir)/creation/node_cor.js" >> a.out
+	echo "nodejs $(srcdir)/creation/node_cor.js \"$$""@\"" >> a.out
 	chmod a+x a.out
 
@@ -471,5 +471,5 @@
 	$(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
 	echo "#!/bin/sh" > a.out
-	echo "java JavaThread" >> a.out
+	echo "java JavaThread \"$$""@\"" >> a.out
 	chmod a+x a.out
 
Index: benchmark/creation/JavaThread.java
===================================================================
--- benchmark/creation/JavaThread.java	(revision e23542987c42024e758269c7930ff52bdaf97f78)
+++ benchmark/creation/JavaThread.java	(revision 0d72d45ea31cbbd475ba7bfbaaa64af872033517)
@@ -47,6 +47,6 @@
 	}
 	public static void main(String[] args) throws InterruptedException {
-		if ( args.length > 2 ) System.exit( 1 );
-		if ( args.length == 2 ) { times = Long.parseLong(args[1]); }
+		if ( args.length > 1 ) System.exit( 1 );
+		if ( args.length == 1 ) { times = Long.parseLong(args[0]); }
 
 		for (int i = Integer.parseInt("5"); --i >= 0 ; ) {
Index: benchmark/ctxswitch/JavaThread.java
===================================================================
--- benchmark/ctxswitch/JavaThread.java	(revision e23542987c42024e758269c7930ff52bdaf97f78)
+++ benchmark/ctxswitch/JavaThread.java	(revision 0d72d45ea31cbbd475ba7bfbaaa64af872033517)
@@ -40,6 +40,6 @@
 	}
 	public static void main(String[] args) throws InterruptedException {
-		if ( args.length > 2 ) System.exit( 1 );
-		if ( args.length == 2 ) { times = Long.parseLong(args[1]); }
+		if ( args.length > 1 ) System.exit( 1 );
+		if ( args.length == 1 ) { times = Long.parseLong(args[0]); }
 
 		for (int i = Integer.parseInt("5"); --i >= 0 ; ) {
Index: benchmark/mutex/JavaThread.java
===================================================================
--- benchmark/mutex/JavaThread.java	(revision e23542987c42024e758269c7930ff52bdaf97f78)
+++ benchmark/mutex/JavaThread.java	(revision 0d72d45ea31cbbd475ba7bfbaaa64af872033517)
@@ -47,6 +47,6 @@
 	}
 	public static void main(String[] args) throws InterruptedException {
-		if ( args.length > 2 ) System.exit( 1 );
-		if ( args.length == 2 ) { times = Long.parseLong(args[1]); }
+		if ( args.length > 1 ) System.exit( 1 );
+		if ( args.length == 1 ) { times = Long.parseLong(args[0]); }
 
 		for (int n = Integer.parseInt("5"); --n >= 0 ; ) {
Index: benchmark/schedint/JavaThread.java
===================================================================
--- benchmark/schedint/JavaThread.java	(revision e23542987c42024e758269c7930ff52bdaf97f78)
+++ benchmark/schedint/JavaThread.java	(revision 0d72d45ea31cbbd475ba7bfbaaa64af872033517)
@@ -75,6 +75,6 @@
 	}
 	public static void main(String[] args) throws InterruptedException {
-		if ( args.length > 2 ) System.exit( 1 );
-		if ( args.length == 2 ) { times = Long.parseLong(args[1]); }
+		if ( args.length > 1 ) System.exit( 1 );
+		if ( args.length == 1 ) { times = Long.parseLong(args[0]); }
 
 		for (int n = Integer.parseInt("5"); --n >= 0 ; ) {
