diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java
index ab15e3a1..4034a10e 100644
--- a/common/buildcraft/silicon/BlockAssemblyTable.java
+++ b/common/buildcraft/silicon/BlockAssemblyTable.java
@@ -93,7 +93,7 @@ public class BlockAssemblyTable extends BlockContainer {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) {
-		par3List.add(new ItemStack(this,0,0));
-		par3List.add(new ItemStack(this,0,1));
+		par3List.add(new ItemStack(this,1,0));
+		par3List.add(new ItemStack(this,1,1));
 	}
 }
diff --git a/common/buildcraft/silicon/ItemAssemblyTable.java b/common/buildcraft/silicon/ItemAssemblyTable.java
index 3c63e300..17b7314b 100644
--- a/common/buildcraft/silicon/ItemAssemblyTable.java
+++ b/common/buildcraft/silicon/ItemAssemblyTable.java
@@ -7,6 +7,7 @@ import net.minecraft.src.ItemStack;
 public class ItemAssemblyTable extends ItemBlock {
 	public ItemAssemblyTable(int par1) {
 		super(par1);
+		setMaxDamage(0);
 		setHasSubtypes(true);
 	}
 
@@ -17,6 +18,6 @@ public class ItemAssemblyTable extends ItemBlock {
 
 	@Override
 	public int getMetadata(int par1) {
-		return par1 > 0 && par1 < 2 ? par1 : 0;
+		return par1 == 1 ? 1 : 0;
 	}
 }