diff --git a/Assets/Scripts/FishingController.cs b/Assets/Scripts/FishingController.cs
index eea54b3..fc4af7d 100644
--- a/Assets/Scripts/FishingController.cs
+++ b/Assets/Scripts/FishingController.cs
@@ -113,7 +113,7 @@ public class FishingController : MonoBehaviour {
             Debug.Log("Tried to catch!");
             if (_fishingTime <= _maxTime) {
                 Debug.Log("Caught!");
-                Inventory.instance.AddItem(ItemContainer.Instance.GetItemByName("Fish"), Math.Max((int)(1 / (_fishingTime/2)), 1));
+                _iv.AddItem(_ic.GetItemByName("Fish"), Math.Max((int)(1 / (_fishingTime/2)), 1));
                 ResetFishing();
             } else {
                 Debug.Log("Failed to catch!");
diff --git a/Assets/Scripts/Inventory.cs b/Assets/Scripts/Inventory.cs
index 98b18f2..a48fa53 100644
--- a/Assets/Scripts/Inventory.cs
+++ b/Assets/Scripts/Inventory.cs
@@ -7,7 +7,7 @@ public class Inventory : ItemStorage {
     public static Inventory instance;
 
     private void Awake() {
-        if(instance != null) {
+        if (instance != null) {
             Debug.LogWarning("More than one instance of Inventory found");
         }
 
@@ -15,31 +15,29 @@ public class Inventory : ItemStorage {
     }
 
     #endregion
-    
+
     private const int InventorySpace = 28;
     private const int MaxItemStack = 999;
-    
+
     /**
      * Adds the specified amount of items to the Inventory
      */
     public override void AddItem(Item item, int amount) {
-        if(items.Count >= InventorySpace) {
+        if (items.Count >= InventorySpace) {
             Debug.Log("Not enough inventory space!");
             return;
         }
         // Sell overflowing Items
-        if(items.ContainsKey(item) && items[item] + amount >= MaxItemStack) {
+        if (items.ContainsKey(item) && items[item] + amount >= MaxItemStack) {
             SellItem(item, amount - (MaxItemStack - items[item]));
             amount = MaxItemStack - items[item];
         }
         base.AddItem(item, amount);
     }
 
-    public override void RemoveItem(Item item, int amount)
-    {
+    public override void RemoveItem(Item item, int amount) {
         base.RemoveItem(item, amount);
-        if (!items.ContainsKey(item))
-        {
+        if (!items.ContainsKey(item) && PlayerController.instance.GetSelectedItem() == item) {
             PlayerController.instance.DeselectItem();
         }
     }
@@ -49,4 +47,4 @@ public class Inventory : ItemStorage {
         Shop.instance.AddItem(item, amount);
         RemoveItem(item, amount);
     }
-}
+}
\ No newline at end of file