diff --git a/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala b/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala
index f354ce2..4ff08ea 100644
--- a/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala
+++ b/src/main/scala/com/databricks/spark/sql/perf/Benchmark.scala
@@ -108,7 +108,7 @@ abstract class Benchmark(
       forkThread: Boolean = true) = {
 
     new ExperimentStatus(executionsToRun, includeBreakdown, iterations, variations, tags,
-      timeout, resultLocation, sqlContext, allTables, currentConfiguration)
+      timeout, resultLocation, sqlContext, allTables, currentConfiguration, forkThread = forkThread)
   }
 
 
diff --git a/src/main/scala/com/databricks/spark/sql/perf/Benchmarkable.scala b/src/main/scala/com/databricks/spark/sql/perf/Benchmarkable.scala
index d8c7148..6303843 100644
--- a/src/main/scala/com/databricks/spark/sql/perf/Benchmarkable.scala
+++ b/src/main/scala/com/databricks/spark/sql/perf/Benchmarkable.scala
@@ -45,9 +45,9 @@ trait Benchmarkable extends Logging {
     sparkContext.setJobDescription(s"Execution: $name, $description")
     beforeBenchmark()
     val result = if (forkThread) {
-      doBenchmark(includeBreakdown, description, messages)
-    } else {
       runBenchmarkForked(includeBreakdown, description, messages, timeout)
+    } else {
+      doBenchmark(includeBreakdown, description, messages)
     }
     afterBenchmark(sqlContext.sparkContext)
     result