diff --git a/src/main/java/appeng/me/storage/BasicCellInventory.java b/src/main/java/appeng/me/storage/BasicCellInventory.java
index 15cdff2d4..f7ab99c85 100644
--- a/src/main/java/appeng/me/storage/BasicCellInventory.java
+++ b/src/main/java/appeng/me/storage/BasicCellInventory.java
@@ -277,6 +277,7 @@ public class BasicCellInventory<T extends IAEStack<T>> extends AbstractCellInven
 		}
 
 		t.setStackSize( stackSize );
+		t.setCraftable( false );
 
 		if( stackSize > 0 )
 		{
diff --git a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java
index 8cb836c6d..4fdb5b686 100644
--- a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java
+++ b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java
@@ -312,7 +312,6 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 				if( storedStack == null )
 				{
 					changes.add( cachedStack.setStackSize( -cachedStack.getStackSize() ) );
-					cachedAeStacksIterator.remove();
 				}
 				else if( cachedStack.getStackSize() != storedStack.getStackSize() )
 				{