diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOilWell.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOilWell.java
index e041b1e45..0e78066a2 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOilWell.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOilWell.java
@@ -279,11 +279,7 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent
 						if(b == ModBlocks.oil_pipe)
 							continue;
 						
-						if(b == Blocks.air || b == Blocks.grass || b == Blocks.dirt || 
-								b == Blocks.stone || b == Blocks.sand || b == Blocks.sandstone || 
-								b == Blocks.clay || b == Blocks.hardened_clay || b == Blocks.stained_hardened_clay || 
-								b == Blocks.gravel || isOre(b, worldObj.getBlockMetadata(xCoord, i, zCoord)) ||
-								b.isReplaceable(worldObj, xCoord, i, zCoord)) {
+						if(b.isReplaceable(worldObj, xCoord, i, zCoord) || b.getExplosionResistance(null) < 100) {
 							worldObj.setBlock(xCoord, i, zCoord, ModBlocks.oil_pipe);
 						
 							//Code 2: The drilling ended
@@ -345,21 +341,6 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent
 		
 	}
 	
-	public boolean isOre(Block b, int meta) {
-		
-		int[] ids = OreDictionary.getOreIDs(new ItemStack(b, 1, meta));
-		
-		for(int i = 0; i < ids.length; i++) {
-			
-			String s = OreDictionary.getOreName(ids[i]);
-			
-			if(s.length() > 3 && s.substring(0, 3).equals("ore"))
-				return true;
-		}
-		
-		return false;
-	}
-	
 	public boolean succ(int x, int y, int z) {
 		
 		list.clear();
diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java
index 17d5683f2..b552ff332 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java
@@ -282,11 +282,7 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven
 						if(b == ModBlocks.oil_pipe)
 							continue;
 						
-						if(b == Blocks.air || b == Blocks.grass || b == Blocks.dirt || 
-								b == Blocks.stone || b == Blocks.sand || b == Blocks.sandstone || 
-								b == Blocks.clay || b == Blocks.hardened_clay || b == Blocks.stained_hardened_clay || 
-								b == Blocks.gravel || isOre(b, worldObj.getBlockMetadata(xCoord, i, zCoord)) ||
-								b.isReplaceable(worldObj, xCoord, i, zCoord)) {
+						if(b.isReplaceable(worldObj, xCoord, i, zCoord) || b.getExplosionResistance(null) < 100) {
 							worldObj.setBlock(xCoord, i, zCoord, ModBlocks.oil_pipe);
 						
 							//Code 2: The drilling ended
@@ -350,21 +346,6 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven
 		
 	}
 	
-	public boolean isOre(Block b, int meta) {
-		
-		int[] ids = OreDictionary.getOreIDs(new ItemStack(b, 1, meta));
-		
-		for(int i = 0; i < ids.length; i++) {
-			
-			String s = OreDictionary.getOreName(ids[i]);
-			
-			if(s.length() > 3 && s.substring(0, 3).equals("ore"))
-				return true;
-		}
-		
-		return false;
-	}
-	
 	public boolean succ(int x, int y, int z) {
 		
 		list.clear();