diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 2cd280990..f693db4fe 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -11,22 +11,6 @@ body:
       options:
         - label: I confirm this is not a duplicate.
           required: true
-  - type: input
-    id: os
-    attributes:
-      label: Operating System
-      description: What operating system are you using?
-      placeholder: "Example: macOS Big Sur"
-    validations:
-      required: true
-  - type: input
-    id: version
-    attributes:
-      label: Server Software Version/Commit
-      description: What Server Software Version/Commit are you using?
-      placeholder: "Example: 1.0.0/39b4cb3"
-    validations:
-      required: true
   - type: textarea
     id: problem
     attributes:
diff --git a/pumpkin/src/client/player_packet.rs b/pumpkin/src/client/player_packet.rs
index d46e486e0..845c06cb1 100644
--- a/pumpkin/src/client/player_packet.rs
+++ b/pumpkin/src/client/player_packet.rs
@@ -657,11 +657,16 @@ impl Player {
         if self.gamemode.load() != GameMode::Creative {
             return Err(InventoryError::PermissionError);
         }
-        self.inventory.lock().await.set_slot(
-            packet.slot as usize,
-            packet.clicked_item.to_item(),
-            false,
-        )
+        let valid_slot = packet.slot >= 1 && packet.slot <= 45;
+        if valid_slot {
+            self.inventory.lock().await.set_slot(
+                packet.slot as usize,
+                packet.clicked_item.to_item(),
+                false,
+            )?;
+        };
+        // TODO: The Item was droped per drag and drop,
+        Ok(())
     }
 
     // TODO: