diff --git a/src/Corporation/corporate-divisionAcquiring.js b/src/Corporation/corporate-divisionAcquiring.js
index fc997b397fa832aaca9c25b5e16a99822c1e58d8..66b22415dfccd386afa8a51c7258d57fd62280b2 100644
--- a/src/Corporation/corporate-divisionAcquiring.js
+++ b/src/Corporation/corporate-divisionAcquiring.js
@@ -54,6 +54,7 @@ App.Corporate.Init_DivisionAcquiring = function(shared) {
         }
         get nextDivisions()       { return this._const.nextDivisions; }
         dissolve() {
+            App.Corporate.sellSlaves(this, this.heldSlaves);
             super.dissolve();
             delete V[`${this._const.corpId}Slaves`];
         }
diff --git a/src/Corporation/corporate-divisionBase.js b/src/Corporation/corporate-divisionBase.js
index a947a548b8901aa48564ed9b44d4bc979ce7c44b..8bd77675d9121cf0f09073358b1a1d1f6106932f 100644
--- a/src/Corporation/corporate-divisionBase.js
+++ b/src/Corporation/corporate-divisionBase.js
@@ -41,10 +41,9 @@ App.Corporate.Init_DivisionBase = function(shared) {
         get developmentCount()      { return this.getStored("Dev"); }
         set developmentCount(value) {
             if(value < 0) throw "Cannot set development count to less than 0";
+            //dissolve is the only function that sets founded to false.
+            if(value == 0 && this.founded) throw "Cannot set development count to 0; use dissolve instead.";
             this.setStored("Dev", value);
-            if(value == 0) {
-                this.dissolve();
-            }
         }
 
         //calculated
@@ -193,7 +192,7 @@ App.Corporate.Init_DivisionBase = function(shared) {
         }
         dissolve() {
             this.setStored('', 0);
-            this.setStored('Dev', 0);
+            this.developmentCount = 0;
             App.Corporate.dissolvedDivision();
             this.relatedDivisions.to.forEach(nextDep => delete V[`${this._const.corpId}To${nextDep.id}`]);
         }
diff --git a/src/Corporation/corporate-divisionProcessing.js b/src/Corporation/corporate-divisionProcessing.js
index 7709077c13a3058b58acac136bfb20126149b4b4..3631deaffb36e7a3b994828902d273efe7438103 100644
--- a/src/Corporation/corporate-divisionProcessing.js
+++ b/src/Corporation/corporate-divisionProcessing.js
@@ -72,6 +72,7 @@ App.Corporate.Init_DivisionProcessing = function(shared) {
             shared.SellOverflowSlaves(this);
         }
         dissolve() {
+            App.Corporate.sellSlaves(this, this.heldSlaves);
             super.dissolve();
             delete V[this._const.corpId + "Slaves"];
             delete V[this._const.corpId + "Slaves2"];
diff --git a/src/Corporation/corporate.js b/src/Corporation/corporate.js
index 8c981e43e6d5bdbc27f6e70475e90ec5e9ce56a8..9296a8efc3efae49728263b47c37381b8eeed70e 100644
--- a/src/Corporation/corporate.js
+++ b/src/Corporation/corporate.js
@@ -394,7 +394,7 @@ App.Corporate.Init = function() {
         SellOverflowSlaves: function(division) {
             const slavesToSell  = division.activeSlaves - division.developmentCount;
             if(slavesToSell > 0) {
-                const slaveProcCost = Math.trunc(App.Corporate.slaveMarketPurchaseValue(this, -slavesToSell));
+                const slaveProcCost = Math.trunc(App.Corporate.slaveMarketPurchaseValue(division, -slavesToSell));
                 App.Corporate.chargeAsset(slaveProcCost, "slaves");
                 division.activeSlaves -= slavesToSell;
                 V.menialDemandFactor -= slavesToSell;
@@ -594,10 +594,7 @@ App.Corporate.Init = function() {
     };
     App.Corporate.dissolve = function() {
         for(let division of this.divisionList.filter(x=>x.founded)) {
-            if(division.toMarket) {
-                this.sellSlaves(division, division.heldSlaves);
-            }
-            division.developmentCount = 0;
+            this.dissolveDivision(division);
         }
         this.founded = false;
         this.numDivisions = 0;
diff --git a/src/Corporation/manageCorporation.tw b/src/Corporation/manageCorporation.tw
index 1cd33c468fc022b71e8aff9135a4a3c743fee5c2..220018e0a5db6079c64a77a7d6f0d73667725343 100644
--- a/src/Corporation/manageCorporation.tw
+++ b/src/Corporation/manageCorporation.tw
@@ -230,10 +230,10 @@
         <</if>>
         </div>
     <</if>>
-    <<if App.Corporate.divisions > 1>> /* Cannot dissolve the last division */
+    <<if App.Corporate.numDivisions > 1>> /* Cannot dissolve the last division */
         <div>Dissolve the division @@.orange;//Think before you click//@@ /* TODO: Add a confirmation button. Probably use replace?*/
         <<= "[[Dissolve|Manage Corporation]"
-          + "[App.Corporate.sellDevelopment('" + _div.id + "', " + _div.developmentCount + ")]"
+          + "[App.Corporate.divisions['" + _div.id + "'].dissolve()]"
           + "]">>
         </div>
     <</if>>