diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java
index 0048725..4fbb1fe 100644
--- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java	
+++ b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java	
@@ -149,6 +149,10 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit {
         return lastAction;
     }
 
+    public Action getCurrentAction() {
+        return currentAction;
+    }
+
     public void setHologram(char hologram) {
         this.hologram = hologram;
     }
diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java
index ea09b09..6faf457 100644
--- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java	
+++ b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java	
@@ -42,7 +42,7 @@ public class CubotDrill extends CpuHardware {
         } else if (a == GATHER_SLOW || a == GATHER_FAST) {
 
             if (cubot.spendEnergy(1400)) {
-                if (cubot.getAction() == Action.IDLE) {
+                if (cubot.getCurrentAction() == Action.IDLE) {
                     int tile = cubot.getWorld().getTileMap().getTileAt(cubot.getX(), cubot.getY());
 
                     if (tile == TileMap.IRON_TILE) {
diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLaser.java b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLaser.java
index 22a3a17..341f59b 100644
--- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLaser.java	
+++ b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLaser.java	
@@ -49,7 +49,7 @@ public class CubotLaser extends CpuHardware {
             ArrayList<GameObject> objects = cubot.getWorld().getGameObjectsAt(frontTile.x, frontTile.y);
 
 
-            if (cubot.getAction() == Action.IDLE && objects.size() > 0) {
+            if (cubot.getCurrentAction() == Action.IDLE && objects.size() > 0) {
                 //FIXME: Problem here if more than 1 object
                 if (objects.get(0) instanceof InventoryHolder) {
                     if (((InventoryHolder) objects.get(0)).canTakeItem(b)) {
@@ -62,6 +62,8 @@ public class CubotLaser extends CpuHardware {
                         }
                     }
                 }
+            } else {
+                System.out.println("\n\n\n\n\n It did it");
             }