diff --git a/src/me/mrCookieSlime/Slimefun/listeners/AutonomousToolsListener.java b/src/me/mrCookieSlime/Slimefun/listeners/AutonomousToolsListener.java
index 342b3e53f..c68af26d6 100644
--- a/src/me/mrCookieSlime/Slimefun/listeners/AutonomousToolsListener.java
+++ b/src/me/mrCookieSlime/Slimefun/listeners/AutonomousToolsListener.java
@@ -11,6 +11,7 @@ import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.Dispenser;
+import org.bukkit.block.data.Directional;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockDispenseEvent;
@@ -27,15 +28,9 @@ public class AutonomousToolsListener implements Listener {
 		Block dispenser = e.getBlock();
 		if (dispenser.getType() == Material.DISPENSER) {
 			final Dispenser d = (Dispenser) dispenser.getState();
-			BlockFace face = BlockFace.DOWN;
-			 
-			if( dispenser.getData() == 8) face = BlockFace.DOWN;
-			else if( dispenser.getData() == 9) face = BlockFace.UP;
-			else if( dispenser.getData() == 10) face = BlockFace.NORTH;
-			else if( dispenser.getData() == 11) face = BlockFace.SOUTH;
-			else if( dispenser.getData() == 12) face = BlockFace.WEST;
-			else if( dispenser.getData() == 13) face = BlockFace.EAST;
-			
+
+			BlockFace face = ((Directional)dispenser.getBlockData()).getFacing();
+
 			Block block = dispenser.getRelative(face);
 			Block chest = dispenser.getRelative(face.getOppositeFace());
 			SlimefunItem machine = BlockStorage.check(dispenser);