diff --git a/evmcc/Compiler.cpp b/evmcc/Compiler.cpp
index 1e2982b29..806592287 100644
--- a/evmcc/Compiler.cpp
+++ b/evmcc/Compiler.cpp
@@ -879,6 +879,10 @@ void Compiler::linkBasicBlocks()
 	/// Helper function that finds basic block given LLVM basic block pointer
 	auto findBasicBlock = [this](llvm::BasicBlock* _llbb) -> BasicBlock&
 	{
+		// TODO: Fix for finding jumpTableBlock
+		if (_llbb == this->m_jumpTableBlock->llvm())
+			return *this->m_jumpTableBlock;
+
 		// Name is used to get basic block index (index of first instruction)
 		// TODO: If basicBlocs are still a map - multikey map can be used
 		auto&& idxStr = _llbb->getName().substr(sizeof(BasicBlock::NamePrefix) - 2);