diff --git a/core/AEConfig.java b/core/AEConfig.java
index 62baae28..49007049 100644
--- a/core/AEConfig.java
+++ b/core/AEConfig.java
@@ -267,11 +267,11 @@ public class AEConfig extends Configuration implements IConfigureableObject, ICo
 
 			min = Math.max( min, thisInt + 1 );
 		}
-
+		
 		if ( alreadyUsed )
 		{
-			if ( min < 1000 )
-				min = 1000;
+			if ( min < 16383 )
+				min = 16383;
 
 			return min;
 		}
diff --git a/items/parts/ItemPart.java b/items/parts/ItemPart.java
index 85e26169..9299c542 100644
--- a/items/parts/ItemPart.java
+++ b/items/parts/ItemPart.java
@@ -80,7 +80,7 @@ public class ItemPart extends AEBaseItem implements IPartItem, IItemGroup
 
 		if ( enabled )
 		{
-			int newPartNum = AEConfig.instance.get( "parts", name, AEConfig.instance.getFreePart( varID ) ).getInt();
+			int newPartNum = AEConfig.instance.get( "parts", name, AEConfig.instance.getFreePart( mat.ordinal() * 32 + varID ) ).getInt();
 			ItemStackSrc output = new ItemStackSrc( this, newPartNum );
 
 			PartTypeIst pti = new PartTypeIst();