diff --git a/evmcc/GasMeter.cpp b/evmcc/GasMeter.cpp
index 7ba822e4a6..13d81b080e 100644
--- a/evmcc/GasMeter.cpp
+++ b/evmcc/GasMeter.cpp
@@ -51,24 +51,20 @@ uint64_t getStepCost(dev::eth::Instruction inst) // TODO: Add this function to F
 
 bool isCostBlockEnd(Instruction _inst)
 {
+	// Basic block terminators like STOP are not needed on the list
+	// as cost will be commited at the end of basic block
 	switch (_inst)
 	{
-	case Instruction::STOP:
 	case Instruction::CALLDATACOPY:
 	case Instruction::CODECOPY:
 	case Instruction::MLOAD:
 	case Instruction::MSTORE:
 	case Instruction::MSTORE8:
 	case Instruction::SSTORE:
-	case Instruction::JUMP:
-	case Instruction::JUMPI:
-	case Instruction::JUMPDEST:
 	case Instruction::GAS:
 	case Instruction::CREATE:
 	case Instruction::CALL:
 	case Instruction::CALLCODE:
-	case Instruction::RETURN:
-	case Instruction::SUICIDE:
 		return true;
 
 	default:
@@ -116,7 +112,11 @@ void GasMeter::commitCostBlock()
 	// If any uncommited block
 	if (m_checkCall)
 	{
-		m_checkCall->setArgOperand(0, m_builder.getIntN(256, m_blockCost)); // Update block cost in gas check call
+		if (m_blockCost > 0) // If any cost
+			m_checkCall->setArgOperand(0, m_builder.getIntN(256, m_blockCost)); // Update block cost in gas check call
+		else
+			m_checkCall->eraseFromParent(); // Remove the gas check call
+
 		m_checkCall = nullptr; // End cost-block
 		m_blockCost = 0;
 	}