diff --git a/gui/fitCommands/gui/localDrone/imprt.py b/gui/fitCommands/gui/localDrone/imprt.py
index 625e0f5f9..865d56c73 100644
--- a/gui/fitCommands/gui/localDrone/imprt.py
+++ b/gui/fitCommands/gui/localDrone/imprt.py
@@ -14,22 +14,23 @@ class GuiImportLocalDronesCommand(wx.Command):
         wx.Command.__init__(self, True, 'Import Local Drones')
         self.internalHistory = InternalCommandHistory()
         self.fitID = fitID
-        self.drones = drones
-
-    def Do(self):
-        results = []
-        for itemID, amount, mutation in self.drones:
+        self.droneInfos = []
+        for itemID, amount, mutation in drones:
             if mutation:
                 mutaplasmid, attrs = mutation
-                info = DroneInfo(
+                self.droneInfos.append(DroneInfo(
                     itemID=mutaplasmid.resultingItem.ID,
                     amount=amount,
                     amountActive=0,
                     baseItemID=itemID,
                     mutaplasmidID=mutaplasmid.ID,
-                    mutations=attrs)
+                    mutations=attrs))
             else:
-                info = DroneInfo(itemID=itemID, amount=amount, amountActive=0)
+                self.droneInfos.append(DroneInfo(itemID=itemID, amount=amount, amountActive=0))
+
+    def Do(self):
+        results = []
+        for info in self.droneInfos:
             cmd = CalcAddLocalDroneCommand(fitID=self.fitID, droneInfo=info, forceNewStack=True)
             results.append(self.internalHistory.submit(cmd))
         success = any(results)
diff --git a/gui/fitCommands/gui/localFighter/imprt.py b/gui/fitCommands/gui/localFighter/imprt.py
index 9ad5d39d4..3a93cc6c7 100644
--- a/gui/fitCommands/gui/localFighter/imprt.py
+++ b/gui/fitCommands/gui/localFighter/imprt.py
@@ -14,11 +14,11 @@ class GuiImportLocalFightersCommand(wx.Command):
         wx.Command.__init__(self, True, 'Import Local Fighters')
         self.internalHistory = InternalCommandHistory()
         self.fitID = fitID
-        self.fighters = fighters
+        self.fighters = [(i, a) for i, a, m in fighters]
 
     def Do(self):
         results = []
-        for itemID, amount, mutation in self.fighters:
+        for itemID, amount in self.fighters:
             cmd = CalcAddLocalFighterCommand(fitID=self.fitID, fighterInfo=FighterInfo(itemID=itemID, amount=amount, state=False))
             results.append(self.internalHistory.submit(cmd))
         success = any(results)