diff --git a/src/main/java/com/jadventure/game/entities/Entity.java b/src/main/java/com/jadventure/game/entities/Entity.java
index de6829fc..62100a3d 100644
--- a/src/main/java/com/jadventure/game/entities/Entity.java
+++ b/src/main/java/com/jadventure/game/entities/Entity.java
@@ -201,7 +201,7 @@ public HashMap equipItem(String place, Item item) {
               }
          }
          this.equipment.put(place, item);
-         removeItemFromStorage(item);
+         //removeItemFromStorage(item);
          HashMap<String, String> result = new HashMap<String, String>();
          switch (item.getItemID().charAt(0)) {
               case 'w': {
@@ -247,7 +247,7 @@ public HashMap unequipItem(Item item) {
          if (!place.isEmpty()) {
               this.equipment.put(place, new Item("empty"));
          }
-         addItemToStorage(item);
+         //addItemToStorage(item);
          HashMap<String, String> result = new HashMap<String, String>();
          if (item.propertiesContainsKey("damage")) {
             this.weapon = "hands";   
diff --git a/src/main/java/com/jadventure/game/entities/Player.java b/src/main/java/com/jadventure/game/entities/Player.java
index 77e6c3e7..7a66cadc 100644
--- a/src/main/java/com/jadventure/game/entities/Player.java
+++ b/src/main/java/com/jadventure/game/entities/Player.java
@@ -313,16 +313,16 @@ public void equipItem(String itemName) {
     }
 
     public void equipItem(String place, String itemName) {
-	    Item item = new Item("empty");
-	    if (!itemName.equals("empty")) {
+        Item item = new Item("empty");
+        if (!itemName.equals("empty")) {
             ArrayList<Item> itemMap = searchItem(itemName, getStorage());
             if (!itemMap.isEmpty()) {
                 item = itemMap.get(0);
             }
-         }
-         HashMap change = this.equipItem(place, item);
-         QueueProvider.offer(item.getName() + " equipped");
-         printStatChange(change);
+        }
+        HashMap change = this.equipItem(place, item);
+        QueueProvider.offer(item.getName() + " equipped");
+        printStatChange(change);
     }
     
     public void dequipItem(String itemName) {