diff --git a/libevmjit/GasMeter.cpp b/libevmjit/GasMeter.cpp
index 82b587dd8..d3f6c10f3 100644
--- a/libevmjit/GasMeter.cpp
+++ b/libevmjit/GasMeter.cpp
@@ -28,11 +28,9 @@ uint64_t getStepCost(Instruction inst) // TODO: Add this function to FeeSructure
 	{
 	case Instruction::STOP:
 	case Instruction::SUICIDE:
+	case Instruction::SSTORE: // Handle cost of SSTORE separately in GasMeter::countSStore()
 		return 0;
 
-	case Instruction::SSTORE:
-		return static_cast<uint64_t>(c_sstoreResetGas); // FIXME: Check store gas
-
 	case Instruction::SLOAD:
 		return static_cast<uint64_t>(c_sloadGas);
 
@@ -118,8 +116,7 @@ void GasMeter::count(Instruction _inst)
 		m_checkCall = m_builder.CreateCall(m_gasCheckFunc, llvm::UndefValue::get(Type::i256));
 	}
 
-	if (_inst != Instruction::SSTORE) // Handle cost of SSTORE separately in countSStore()
-		m_blockCost += getStepCost(_inst);
+	m_blockCost += getStepCost(_inst);
 
 	if (isCostBlockEnd(_inst))
 		commitCostBlock();
@@ -129,20 +126,18 @@ void GasMeter::countSStore(Ext& _ext, llvm::Value* _index, llvm::Value* _newValu
 {
 	assert(!m_checkCall); // Everything should've been commited before
 
-	static const auto sstoreCost = static_cast<uint64_t>(c_sstoreResetGas); // FIXME: Check store gas
-
-	// [ADD] if oldValue == 0 and newValue != 0  =>  2*cost
-	// [DEL] if oldValue != 0 and newValue == 0  =>  0
+	static const auto updateCost = static_cast<uint64_t>(c_sstoreResetGas); // TODO: Discuss naming (DB names look better)
+	static const auto insertCost = static_cast<uint64_t>(c_sstoreSetGas);
 
 	auto oldValue = _ext.store(_index);
 	auto oldValueIsZero = m_builder.CreateICmpEQ(oldValue, Constant::get(0), "oldValueIsZero");
 	auto newValueIsZero = m_builder.CreateICmpEQ(_newValue, Constant::get(0), "newValueIsZero");
 	auto oldValueIsntZero = m_builder.CreateICmpNE(oldValue, Constant::get(0), "oldValueIsntZero");
 	auto newValueIsntZero = m_builder.CreateICmpNE(_newValue, Constant::get(0), "newValueIsntZero");
-	auto isAdd = m_builder.CreateAnd(oldValueIsZero, newValueIsntZero, "isAdd");
-	auto isDel = m_builder.CreateAnd(oldValueIsntZero, newValueIsZero, "isDel");
-	auto cost = m_builder.CreateSelect(isAdd, Constant::get(2 * sstoreCost), Constant::get(sstoreCost), "cost");
-	cost = m_builder.CreateSelect(isDel, Constant::get(0), cost, "cost");
+	auto isInsert = m_builder.CreateAnd(oldValueIsZero, newValueIsntZero, "isInsert");
+	auto isDelete = m_builder.CreateAnd(oldValueIsntZero, newValueIsZero, "isDelete");
+	auto cost = m_builder.CreateSelect(isInsert, Constant::get(insertCost), Constant::get(updateCost), "cost");
+	cost = m_builder.CreateSelect(isDelete, Constant::get(0), cost, "cost");
 	createCall(m_gasCheckFunc, cost);
 }
 
diff --git a/libevmjit/Type.h b/libevmjit/Type.h
index b432f0813..21c41efc0 100644
--- a/libevmjit/Type.h
+++ b/libevmjit/Type.h
@@ -50,7 +50,7 @@ enum class ReturnCode
 struct Constant
 {
 	/// Returns word-size constant
-	static llvm::ConstantInt* get(uint64_t _n);
+	static llvm::ConstantInt* get(uint64_t _n); // TODO: add overload with u256
 
 	static llvm::ConstantInt* get(ReturnCode _returnCode);
 };