diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java
index 06d5e9ae..9d492880 100644
--- a/common/buildcraft/BuildCraftSilicon.java
+++ b/common/buildcraft/BuildCraftSilicon.java
@@ -8,6 +8,7 @@
  */
 package buildcraft;
 
+import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
@@ -531,7 +532,11 @@ public class BuildCraftSilicon extends BuildCraftMod {
 	public void remap(FMLMissingMappingsEvent event) {
 		for (FMLMissingMappingsEvent.MissingMapping mapping: event.get()) {
 			if (mapping.name.equals("BuildCraft|Silicon:null")) {
+				if (mapping.type == GameRegistry.Type.ITEM) {
 					mapping.remap(Item.getItemFromBlock(laserBlock));
+				} else {
+					mapping.remap(laserBlock);
+				}
 			}
 		}
 	}