diff --git a/eos/modifiedAttributeDict.py b/eos/modifiedAttributeDict.py
index 62811b614..ca3615281 100644
--- a/eos/modifiedAttributeDict.py
+++ b/eos/modifiedAttributeDict.py
@@ -195,13 +195,13 @@ class ModifiedAttributeDict(collections.MutableMapping):
         affs = self.__affectedBy[attributeName]
         # If there's no set for current fit in dictionary, create it
         if self.fit not in affs:
-            affs[self.fit] = set()
-        # Reassign alias to set
+            affs[self.fit] = []
+        # Reassign alias to list
         affs = affs[self.fit]
         # Get modifier which helps to compose 'Affected by' map
         modifier = self.fit.getModifier()
-        # Add current affliction to set
-        affs.add((modifier, operation, bonus, used))
+        # Add current affliction to list
+        affs.append((modifier, operation, bonus, used))
 
     def preAssign(self, attributeName, value):
         """Overwrites original value of the entity with given one, allowing further modification"""
diff --git a/gui/itemStats.py b/gui/itemStats.py
index 0851d5bf5..1ca83be55 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -67,7 +67,7 @@ class ItemStatsDialog(wx.Dialog):
             if itemImg is not None:
                 self.SetIcon(wx.IconFromBitmap(itemImg))
         self.SetTitle("%s: %s" % ("%s Stats" % itmContext if itmContext is not None else "Stats", item.name))
-        
+
         self.SetMinSize((300, 200))
         self.SetSize((500, 300))
         self.SetMaxSize((500, -1))
@@ -612,7 +612,6 @@ class ItemAffectedBy (wx.Panel):
         self.imageList = wx.ImageList(16, 16)
         self.affectedBy.SetImageList(self.imageList)
 
-
         cont = self.stuff.itemModifiedAttributes if self.item == self.stuff.item else self.stuff.chargeModifiedAttributes
         things = {}
 
@@ -620,20 +619,26 @@ class ItemAffectedBy (wx.Panel):
             # if value is 0 or there has been no change from original to modified, return
             if cont[attrName] == (cont.getOriginal(attrName) or 0):
                 continue
-
             for fit, afflictors in cont.getAfflictions(attrName).iteritems():
                 for afflictor, modifier, amount, used in afflictors:
                     if not used or afflictor.item is None:
                         continue
+
                     if afflictor.item.name not in things:
-                        things[afflictor.item.name] = [type(afflictor), set(), set()]
+                        things[afflictor.item.name] = [type(afflictor), set(), []]
 
                     info = things[afflictor.item.name]
                     info[1].add(afflictor)
-                    info[2].add((attrName, modifier, amount))
+                    # If info[1] > 1, there are two separate modules working.
+                    # Check to make sure we only include the modifier once
+                    # See GH issue 154
+                    if len(info[1]) > 1 and (attrName, modifier, amount) in info[2]:
+                        continue
+                    info[2].append((attrName, modifier, amount))
 
         order = things.keys()
         order.sort(key=lambda x: (self.ORDER.index(things[x][0]), x))
+
         for itemName in order:
             info = things[itemName]