diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index fb27ba508..710660340 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -397,7 +397,8 @@ class MainFrame(wx.Frame):
             format_ = dlg.GetFilterIndex()
             path = dlg.GetPath()
             if format_ == 0:
-                output = sFit.exportXml(None, self.getActiveFit())
+                sPort = Port.getInstance()
+                output = sPort.exportXml(None, self.getActiveFit())
                 if '.' not in os.path.basename(path):
                     path += ".xml"
             else:
diff --git a/service/fit.py b/service/fit.py
index 6759c5921..c8c97baf5 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -78,11 +78,7 @@ class Fit(object):
 
     def getAllFits(self):
         fits = eos.db.getFitList()
-        names = []
-        for fit in fits:
-            names.append((fit.ID, fit.name))
-
-        return names
+        return fits
 
     def getFitsWithShip(self, shipID):
         """ Lists fits of shipID, used with shipBrowser """
diff --git a/service/port.py b/service/port.py
index e3ce3f545..6eaa8554a 100644
--- a/service/port.py
+++ b/service/port.py
@@ -1133,8 +1133,8 @@ class FitBackupThread(threading.Thread):
     def run(self):
         path = self.path
         sFit = svcFit.getInstance()
-        allFits = map(lambda x: x[0], sFit.getAllFits())
-        backedUpFits = sFit.exportXml(self.callback, *allFits)
+        sPort = Port.getInstance()
+        backedUpFits = sPort.exportXml(self.callback, *sFit.getAllFits())
         backupFile = open(path, "w", encoding="utf-8")
         backupFile.write(backedUpFits)
         backupFile.close()