diff --git a/bench.cpp b/bench.cpp
index 571264f2..c00bc069 100644
--- a/bench.cpp
+++ b/bench.cpp
@@ -206,8 +206,6 @@ void BenchMarkKeyless(const char *name, double timeTotal, T *x=NULL)
 	BenchMark(name, c, timeTotal);
 }
 
-void BenchmarkAll2(double t);
-
 void BenchmarkAll(double t)
 {
 #if 1
diff --git a/bench.h b/bench.h
index e490daf8..496b07a1 100644
--- a/bench.h
+++ b/bench.h
@@ -5,6 +5,7 @@
 
 extern const double CLOCK_TICKS_PER_SECOND;
 
-void BenchmarkAll(double t=1.0);
+void BenchmarkAll(double t);
+void BenchmarkAll2(double t);
 
 #endif
diff --git a/test.cpp b/test.cpp
index a21d351d..77546d2c 100644
--- a/test.cpp
+++ b/test.cpp
@@ -265,12 +265,9 @@ int CRYPTOPP_CDECL main(int argc, char *argv[])
 		else if (command == "v")
 			return !Validate(argc>2 ? atoi(argv[2]) : 0, argv[1][1] == 'v', argc>3 ? argv[3] : NULL);
 		else if (command == "b")
-		{
-			if (argc<3)
-				BenchmarkAll();
-			else
-				BenchmarkAll((float)atof(argv[2]));
-		}
+			BenchmarkAll(argc<3 ? 1 : atof(argv[2]));
+		else if (command == "b2")
+			BenchmarkAll2(argc<3 ? 1 : atof(argv[2]));
 		else if (command == "z")
 			GzipFile(argv[3], argv[4], argv[2][0]-'0');
 		else if (command == "u")