diff --git a/evmcc/Compiler.cpp b/evmcc/Compiler.cpp
index e951788e6..7fccadbf1 100644
--- a/evmcc/Compiler.cpp
+++ b/evmcc/Compiler.cpp
@@ -789,6 +789,15 @@ std::unique_ptr<llvm::Module> Compiler::compile(const dev::bytes& bytecode)
 	builder.SetInsertPoint(finalBlock);
 	builder.CreateRet(builder.getInt64(0));
 
+	linkBasicBlocks();
+
+	return module;
+}
+
+
+void Compiler::linkBasicBlocks()
+{
+	/// Helper function that finds basic block given LLVM basic block pointer
 	auto findBB = [this](llvm::BasicBlock* _llvmBB)
 	{
 		for (auto&& bb : basicBlocks)
@@ -821,8 +830,6 @@ std::unique_ptr<llvm::Module> Compiler::compile(const dev::bytes& bytecode)
 			}
 		}
 	}
-
-	return module;
 }
 
 }
diff --git a/evmcc/Compiler.h b/evmcc/Compiler.h
index 1404a99c5..de73fb7a5 100644
--- a/evmcc/Compiler.h
+++ b/evmcc/Compiler.h
@@ -25,6 +25,8 @@ private:
 	BasicBlock& getOrCreateBasicBlockAtPC(ProgramCounter pc);
 	void createBasicBlocks(const dev::bytes& bytecode);
 
+	void linkBasicBlocks();
+
 	/**
 	 *  Maps a program counter pc to a basic block which starts at pc (if any).
 	 */