diff --git a/src/gui/gui_units.cpp b/src/gui/gui_units.cpp
index 051ef234e..e7528c7bd 100644
--- a/src/gui/gui_units.cpp
+++ b/src/gui/gui_units.cpp
@@ -2115,7 +2115,6 @@ class unit_supply_bar : public progress_bar {
 		}
 
 
-		uint32_t total_commodities = state.world.commodity_size();
 
 		float max_supply = 0.0f;
 		float actual_supply = 0.0f;
@@ -2123,15 +2122,12 @@ class unit_supply_bar : public progress_bar {
 
 		auto nations_commodity_spending = state.world.nation_get_spending_level(owner);
 
-		for(uint32_t i = 0; i < total_commodities; ++i) {
-			if(!commodities.commodity_type[i]) {
-				break;
-			}
+		for(uint32_t i = 0; i < commodities.set_size; ++i) {
 
 			dcon::commodity_id c = commodities.commodity_type[i];
 
 			auto satisfaction = state.world.market_get_actual_probability_to_buy(m, c);
-			auto val = commodities.commodity_type[i];
+
 
 			max_supply += commodities.commodity_amounts[i];
 			actual_supply += commodities.commodity_amounts[i] * satisfaction * nations_commodity_spending * spending_level;