diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java
index 0a5280e..d838f0c 100644
--- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java
+++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java
@@ -25,7 +25,6 @@
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -34,8 +33,6 @@
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.inventory.ClickType;
-import org.bukkit.event.inventory.DragType;
-import org.bukkit.event.inventory.InventoryAction;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
@@ -51,6 +48,7 @@
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerSwapHandItemsEvent;
+import org.bukkit.inventory.CraftingInventory;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
@@ -326,7 +324,12 @@
                 case SWAP_WITH_CURSOR:
                 case COLLECT_TO_CURSOR:
                 case HOTBAR_SWAP:
-                    if (!e.getClickedInventory().equals(player.getInventory())) {
+                    if (e.getClickedInventory() != player.getInventory()) {
+                        e.setCancelled(true);
+                    }
+                    break;
+                case MOVE_TO_OTHER_INVENTORY:
+                    if (!(e.getInventory() instanceof CraftingInventory)) {
                         e.setCancelled(true);
                     }
                     break;
@@ -362,7 +365,9 @@
         }
 
         if (stackMeta != null && stackMeta.getPersistentDataContainer().has(skipKey) || oldStackMeta != null && oldStackMeta.getPersistentDataContainer().has(skipKey)) {
-            e.setCancelled(true);
+            if (!(e.getInventory() instanceof CraftingInventory)) {
+                e.setCancelled(true);
+            }
         }
     }