diff --git a/evmcc/Compiler.cpp b/evmcc/Compiler.cpp
index 18b0a1d3b..e951788e6 100644
--- a/evmcc/Compiler.cpp
+++ b/evmcc/Compiler.cpp
@@ -53,8 +53,7 @@ BasicBlock& Compiler::getOrCreateBasicBlockAtPC(ProgramCounter pc)
 
 void Compiler::createBasicBlocks(const dev::bytes& bytecode)
 {
-	getOrCreateBasicBlockAtPC(0);
-	getOrCreateBasicBlockAtPC(bytecode.size());
+	getOrCreateBasicBlockAtPC(0);	// First basic block
 
 	for (auto curr = bytecode.cbegin(); curr != bytecode.cend(); ++curr)
 	{
@@ -113,13 +112,6 @@ void Compiler::createBasicBlocks(const dev::bytes& bytecode)
 					val |= *iter;
 				}
 
-				// Create a block for the JUMP target.
-				ProgramCounter targetPC = val.convert_to<ProgramCounter>();
-				auto& targetBlock = getOrCreateBasicBlockAtPC(targetPC);
-
-				ProgramCounter jumpPC = (next - bytecode.cbegin());
-				jumpTargets[jumpPC] = targetBlock;
-
 				// Create a block following the JUMP.
 				if (next + 1 < bytecode.cend())
 				{
@@ -127,6 +119,13 @@ void Compiler::createBasicBlocks(const dev::bytes& bytecode)
 					getOrCreateBasicBlockAtPC(nextPC);
 				}
 
+				// Create a block for the JUMP target.
+				ProgramCounter targetPC = val.convert_to<ProgramCounter>();
+				auto& targetBlock = getOrCreateBasicBlockAtPC(targetPC);
+
+				ProgramCounter jumpPC = (next - bytecode.cbegin());
+				jumpTargets[jumpPC] = targetBlock;
+
 				curr += 1; // skip over JUMP
 			}
 
@@ -158,6 +157,8 @@ void Compiler::createBasicBlocks(const dev::bytes& bytecode)
 			break;
 		}
 	}
+
+	getOrCreateBasicBlockAtPC(bytecode.size());	// Final basic block
 }
 
 std::unique_ptr<llvm::Module> Compiler::compile(const dev::bytes& bytecode)