diff --git a/evmjit/libevmjit/BasicBlock.cpp b/evmjit/libevmjit/BasicBlock.cpp
index c9e71be9a..0b7d2e0c4 100644
--- a/evmjit/libevmjit/BasicBlock.cpp
+++ b/evmjit/libevmjit/BasicBlock.cpp
@@ -340,6 +340,8 @@ void BasicBlock::dump(std::ostream& _out, bool _dotOutput)
 	{
 		if (val == nullptr)
 			out << "  ?";
+		else if (llvm::isa<llvm::ExtractValueInst>(val))
+			out << "  " << val->getName();
 		else if (llvm::isa<llvm::Instruction>(val))
 			out << *val;
 		else
@@ -349,8 +351,8 @@ void BasicBlock::dump(std::ostream& _out, bool _dotOutput)
 	}
 
 	out << (_dotOutput ? "| " : "Instructions:\n");
-	for (auto ins = m_llvmBB->begin(); ins != m_llvmBB->end(); ++ins)
-		out << *ins << (_dotOutput ? "\\l" : "\n");
+	//for (auto ins = m_llvmBB->begin(); ins != m_llvmBB->end(); ++ins)
+	//	out << *ins << (_dotOutput ? "\\l" : "\n");
 
 	if (! _dotOutput)
 		out << "Current stack (offset = " << m_tosOffset << "):\n";
@@ -361,6 +363,8 @@ void BasicBlock::dump(std::ostream& _out, bool _dotOutput)
 	{
 		if (*val == nullptr)
 			out << "  ?";
+		else if (llvm::isa<llvm::ExtractValueInst>(*val))
+			out << "  " << (*val)->getName();
 		else if (llvm::isa<llvm::Instruction>(*val))
 			out << **val;
 		else