diff --git a/src/main/java/gregtech/api/capability/INotifiableHandler.java b/src/main/java/gregtech/api/capability/INotifiableHandler.java
index 401c081bc3..9cea3f4cd2 100644
--- a/src/main/java/gregtech/api/capability/INotifiableHandler.java
+++ b/src/main/java/gregtech/api/capability/INotifiableHandler.java
@@ -2,8 +2,8 @@
 
 import gregtech.api.metatileentity.MetaTileEntity;
 
-import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 
 /**
  * For Item and Fluid handlers capable of notifying entities when
@@ -20,10 +20,10 @@ public interface INotifiableHandler {
     default void notifyMetaTileEntitiesOfChange(boolean isExport) {
         Iterator<MetaTileEntity> iterator = getNotifiableMetaTileEntities().iterator();
         while (iterator.hasNext()) {
-            MetaTileEntity mte = iterator.next();
-            if (mte != null && mte.isValid()) {
-                if (isExport) mte.setOutputsDirty(true);
-                else mte.setInputsDirty(true);
+            MetaTileEntity metaTileEntity = iterator.next();
+            if (metaTileEntity != null && metaTileEntity.isValid()) {
+                if (isExport) metaTileEntity.setOutputsDirty(true);
+                else metaTileEntity.setInputsDirty(true);
             } else {
                 iterator.remove();
             }
@@ -31,10 +31,10 @@ default void notifyMetaTileEntitiesOfChange(boolean isExport) {
     }
 
     /**
-     * returns a HashSet containing the notifiable MetaTileEntities
+     * returns a List containing the notifiable MetaTileEntities
      * @return
      */
-    HashSet<MetaTileEntity> getNotifiableMetaTileEntities();
+    List<MetaTileEntity> getNotifiableMetaTileEntities();
 
     /**
      *
diff --git a/src/main/java/gregtech/api/capability/impl/NotifiableFilteredFluidHandler.java b/src/main/java/gregtech/api/capability/impl/NotifiableFilteredFluidHandler.java
index c44738cc11..6554b4da20 100644
--- a/src/main/java/gregtech/api/capability/impl/NotifiableFilteredFluidHandler.java
+++ b/src/main/java/gregtech/api/capability/impl/NotifiableFilteredFluidHandler.java
@@ -3,11 +3,12 @@
 import gregtech.api.capability.INotifiableHandler;
 import gregtech.api.metatileentity.MetaTileEntity;
 
-import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.List;
 
 public class NotifiableFilteredFluidHandler extends FilteredFluidHandler implements INotifiableHandler {
 
-    HashSet<MetaTileEntity> entitiesToNotify = new HashSet<>();
+    List<MetaTileEntity> entitiesToNotify = new ArrayList<>();
     private final boolean isExport;
 
     public NotifiableFilteredFluidHandler(int capacity, MetaTileEntity entityToNotify, boolean isExport) {
@@ -23,7 +24,7 @@ protected void onContentsChanged() {
     }
 
     @Override
-    public HashSet<MetaTileEntity> getNotifiableMetaTileEntities() {
+    public List<MetaTileEntity> getNotifiableMetaTileEntities() {
         return this.entitiesToNotify;
     }
 }
diff --git a/src/main/java/gregtech/api/capability/impl/NotifiableFluidTank.java b/src/main/java/gregtech/api/capability/impl/NotifiableFluidTank.java
index f62b41b240..764e91b057 100644
--- a/src/main/java/gregtech/api/capability/impl/NotifiableFluidTank.java
+++ b/src/main/java/gregtech/api/capability/impl/NotifiableFluidTank.java
@@ -4,11 +4,12 @@
 import gregtech.api.metatileentity.MetaTileEntity;
 import net.minecraftforge.fluids.FluidTank;
 
-import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.List;
 
 public class NotifiableFluidTank extends FluidTank implements INotifiableHandler {
 
-    HashSet<MetaTileEntity> entitiesToNotify = new HashSet<>();
+    List<MetaTileEntity> entitiesToNotify = new ArrayList<>();
     private final boolean isExport;
 
     public NotifiableFluidTank(int capacity, MetaTileEntity entityToNotify, boolean isExport) {
@@ -24,7 +25,7 @@ protected void onContentsChanged() {
     }
 
     @Override
-    public HashSet<MetaTileEntity> getNotifiableMetaTileEntities() {
+    public List<MetaTileEntity> getNotifiableMetaTileEntities() {
         return this.entitiesToNotify;
     }
 }
diff --git a/src/main/java/gregtech/api/capability/impl/NotifiableItemStackHandler.java b/src/main/java/gregtech/api/capability/impl/NotifiableItemStackHandler.java
index 6830838239..12e72eba9e 100644
--- a/src/main/java/gregtech/api/capability/impl/NotifiableItemStackHandler.java
+++ b/src/main/java/gregtech/api/capability/impl/NotifiableItemStackHandler.java
@@ -5,11 +5,12 @@
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.ItemStackHandler;
 
-import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.List;
 
 public class NotifiableItemStackHandler extends ItemStackHandler implements IItemHandlerModifiable, INotifiableHandler {
 
-    HashSet<MetaTileEntity> entitiesToNotify = new HashSet<>();
+    List<MetaTileEntity> entitiesToNotify = new ArrayList<>();
     private final boolean isExport;
 
     public NotifiableItemStackHandler(int slots, MetaTileEntity entityToNotify, boolean isExport) {
@@ -25,7 +26,7 @@ public void onContentsChanged(int slot) {
     }
 
     @Override
-    public HashSet<MetaTileEntity> getNotifiableMetaTileEntities() {
+    public List<MetaTileEntity> getNotifiableMetaTileEntities() {
         return this.entitiesToNotify;
     }
 }