diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index 82dc8b56f..df6652d27 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -1169,14 +1169,11 @@ class Fit(object):
             return self.__remoteReps
 
         for module in self.modules:
-            # Skip empty modules
-            if module.isEmpty:
-                continue
-
-            # Skip modules that aren't online
-            if getattr(module, "state", 0) < 1:
+            # Skip empty and non-Active modules
+            if module.isEmpty or module.state < State.ACTIVE:
                 continue
 
+            # Covert cycleTime to seconds
             duration = module.cycleTime / 1000
 
             # Skip modules with no duration.
diff --git a/gui/builtinStatsViews/outgoingViewFull.py b/gui/builtinStatsViews/outgoingViewFull.py
index 9e92f2db9..d18f84678 100644
--- a/gui/builtinStatsViews/outgoingViewFull.py
+++ b/gui/builtinStatsViews/outgoingViewFull.py
@@ -83,10 +83,10 @@ class OutgoingViewFull(StatsView):
         # If we did anything intresting, we'd update our labels to reflect the new fit's stats here
 
         stats = [
-            ("labelRemoteArmor", lambda: fit.remoteReps["Armor"], 3, 0, 0, u"%s HP/s", None),
-            ("labelRemoteShield", lambda: fit.remoteReps["Shield"], 3, 0, 0, u"%s HP/s", None),
-            ("labelRemoteHull", lambda: fit.remoteReps["Hull"], 3, 0, 0, u"%s HP/s", None),
-            ("labelRemoteCapacitor", lambda: fit.remoteReps["Capacitor"], 3, 0, 0, u"%s GJ/s", None),
+            ("labelRemoteArmor", lambda: fit.armorRR, 3, 0, 0, u"%s HP/s", None),
+            ("labelRemoteShield", lambda: fit.shieldRR, 3, 0, 0, u"%s HP/s", None),
+            ("labelRemoteHull", lambda: fit.hullRR, 3, 0, 0, u"%s HP/s", None),
+            ("labelRemoteCapacitor", lambda: fit.capTransfer, 3, 0, 0, u"%s GJ/s", None),
         ]
 
         counter = 0
diff --git a/gui/builtinStatsViews/outgoingViewMinimal.py b/gui/builtinStatsViews/outgoingViewMinimal.py
index 9e92f2db9..d18f84678 100644
--- a/gui/builtinStatsViews/outgoingViewMinimal.py
+++ b/gui/builtinStatsViews/outgoingViewMinimal.py
@@ -83,10 +83,10 @@ class OutgoingViewFull(StatsView):
         # If we did anything intresting, we'd update our labels to reflect the new fit's stats here
 
         stats = [
-            ("labelRemoteArmor", lambda: fit.remoteReps["Armor"], 3, 0, 0, u"%s HP/s", None),
-            ("labelRemoteShield", lambda: fit.remoteReps["Shield"], 3, 0, 0, u"%s HP/s", None),
-            ("labelRemoteHull", lambda: fit.remoteReps["Hull"], 3, 0, 0, u"%s HP/s", None),
-            ("labelRemoteCapacitor", lambda: fit.remoteReps["Capacitor"], 3, 0, 0, u"%s GJ/s", None),
+            ("labelRemoteArmor", lambda: fit.armorRR, 3, 0, 0, u"%s HP/s", None),
+            ("labelRemoteShield", lambda: fit.shieldRR, 3, 0, 0, u"%s HP/s", None),
+            ("labelRemoteHull", lambda: fit.hullRR, 3, 0, 0, u"%s HP/s", None),
+            ("labelRemoteCapacitor", lambda: fit.capTransfer, 3, 0, 0, u"%s GJ/s", None),
         ]
 
         counter = 0