diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index 44c25b99..cfb55f01 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -14151,6 +14151,11 @@ BOOLEAN OBJECTTYPE::TransformObject( SOLDIERTYPE * pSoldier, UINT8 ubStatusIndex
 	this->usItem = usResult[0];
 	// Record the new itemclass
 	UINT32 uiNewClass = Item[this->usItem].usItemClass;
+
+	// Flugente: if the new item is a food item (and the old one wasn't), we define it to be fresh, so adjust its temperature
+	if ( Item[usOldItem].foodtype == 0 &&  Item[this->usItem].foodtype > 0 )
+		(*this)[0]->data.bTemperature = OVERHEATING_MAX_TEMPERATURE;
+
 	// Make a clone of this object, so that we can point the DescBox to it later if we run into any problems.
 	gCloneItemDescObject = *(this);
 	///////////////////////////////////////////////////////////////
diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp
index c847a610..11216635 100644
--- a/Tactical/Soldier Control.cpp	
+++ b/Tactical/Soldier Control.cpp	
@@ -15345,7 +15345,7 @@ BOOLEAN		SOLDIERTYPE::UsesScubaGear()
 	if ( !( this->inv[ HEAD1POS ].exists() && HasItemFlag(this->inv[ HEAD1POS ].usItem, SCUBA_MASK) ) && !( this->inv[ HEAD2POS ].exists() && HasItemFlag(this->inv[ HEAD2POS ].usItem, SCUBA_MASK) ) )
 		return FALSE;
 
-	if ( !this->inv[VESTPOCKPOS].exists() || !HasItemFlag( this->inv[VESTPOCKPOS].usItem, SCUBA_BOTTLE ) )
+	if ( !this->inv[ CPACKPOCKPOS ].exists() || !HasItemFlag( this->inv[CPACKPOCKPOS].usItem, SCUBA_BOTTLE ) )
 		return FALSE;
 
 	return TRUE;