diff --git a/src/main/java/appeng/core/FeatureHandlerRegistry.java b/src/main/java/appeng/core/FeatureHandlerRegistry.java
index ec35fde37..9bb5f1916 100644
--- a/src/main/java/appeng/core/FeatureHandlerRegistry.java
+++ b/src/main/java/appeng/core/FeatureHandlerRegistry.java
@@ -19,7 +19,7 @@
 package appeng.core;
 
 
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import appeng.core.features.IFeatureHandler;
@@ -27,7 +27,7 @@ import appeng.core.features.IFeatureHandler;
 
 public final class FeatureHandlerRegistry
 {
-	private final Set<IFeatureHandler> registry = new HashSet<IFeatureHandler>();
+	private final Set<IFeatureHandler> registry = new LinkedHashSet<IFeatureHandler>();
 
 	public void addFeatureHandler( IFeatureHandler feature )
 	{
diff --git a/src/main/java/appeng/core/FeatureRegistry.java b/src/main/java/appeng/core/FeatureRegistry.java
index 74848f59f..26fa3920c 100644
--- a/src/main/java/appeng/core/FeatureRegistry.java
+++ b/src/main/java/appeng/core/FeatureRegistry.java
@@ -19,7 +19,7 @@
 package appeng.core;
 
 
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import appeng.core.features.IAEFeature;
@@ -27,7 +27,7 @@ import appeng.core.features.IAEFeature;
 
 public final class FeatureRegistry
 {
-	private final Set<IAEFeature> registry = new HashSet<IAEFeature>();
+	private final Set<IAEFeature> registry = new LinkedHashSet<IAEFeature>();
 
 	public void addFeature( IAEFeature feature )
 	{