diff --git a/evmcc/evmcc.cpp b/evmcc/evmcc.cpp
index 047fdf252..191b87dcf 100644
--- a/evmcc/evmcc.cpp
+++ b/evmcc/evmcc.cpp
@@ -101,7 +101,10 @@ int main(int argc, char** argv)
 	{
 		auto compilationStartTime = std::chrono::high_resolution_clock::now();
 
-		auto compiler = eth::jit::Compiler();
+		eth::jit::Compiler::Options options;
+		options.dumpCFG = opt_dump_graph;
+
+		auto compiler = eth::jit::Compiler(options);
 		auto module = compiler.compile({bytecode.data(), bytecode.size()});
 
 		auto compilationEndTime = std::chrono::high_resolution_clock::now();
@@ -115,14 +118,6 @@ int main(int argc, char** argv)
 			          << std::endl;
 		}
 
-		if (opt_dump_graph)
-		{
-			std::ofstream ofs("blocks.dot");
-			compiler.dumpBasicBlockGraph(ofs);
-			ofs.close();
-			std::cout << "Basic blocks graph written to block.dot\n";
-		}
-
 		if (opt_interpret)
 		{
 			auto engine = eth::jit::ExecutionEngine();