diff --git a/me/storage/SecurityInventory.java b/me/storage/SecurityInventory.java
index 70a045f4c..2de9b8ab3 100644
--- a/me/storage/SecurityInventory.java
+++ b/me/storage/SecurityInventory.java
@@ -21,7 +21,7 @@ public class SecurityInventory implements IMEInventoryHandler<IAEItemStack>
 {
 
 	final TileSecurity securityTile;
-	final public IItemList<IAEItemStack> storedItems = new ItemList( IAEItemStack.class );
+	final public IItemList<IAEItemStack> storedItems = AEApi.instance().storage().createItemList();
 
 	public SecurityInventory(TileSecurity ts) {
 		securityTile = ts;
diff --git a/tile/crafting/TileCraftingTile.java b/tile/crafting/TileCraftingTile.java
index ec51caac4..37ea18c26 100644
--- a/tile/crafting/TileCraftingTile.java
+++ b/tile/crafting/TileCraftingTile.java
@@ -268,7 +268,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
 			if ( places.isEmpty() )
 				throw new RuntimeException( "No air or even the tile hat was destroyed?!?!" );
 
-			for (IAEItemStack ais : inv.getAvailableItems( new ItemList<IAEItemStack>( IAEItemStack.class ) ))
+			for (IAEItemStack ais : inv.getAvailableItems( AEApi.instance().storage().createItemList() ))
 			{
 				ais = ais.copy();
 				ais.setStackSize( ais.getItemStack().getMaxStackSize() );
diff --git a/util/Platform.java b/util/Platform.java
index fd84527c1..92317d707 100644
--- a/util/Platform.java
+++ b/util/Platform.java
@@ -1406,7 +1406,7 @@ public class Platform
 
 			if ( myItems != null )
 			{
-				for (IAEItemStack is : myItems.getAvailableItems( new ItemList( IAEItemStack.class ) ))
+				for (IAEItemStack is : myItems.getAvailableItems( AEApi.instance().storage().createItemList() ))
 				{
 					gs.postAlterationOfStoredItems( StorageChannel.ITEMS, is, src );
 				}
@@ -1416,7 +1416,7 @@ public class Platform
 
 			if ( myFluids != null )
 			{
-				for (IAEFluidStack is : myFluids.getAvailableItems( new ItemList( IAEFluidStack.class ) ))
+				for (IAEFluidStack is : myFluids.getAvailableItems( AEApi.instance().storage().createFluidList() ) )
 				{
 					gs.postAlterationOfStoredItems( StorageChannel.FLUIDS, is, src );
 				}