diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java
index 93098a1..27c5299 100644
--- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java
+++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java
@@ -31,18 +31,18 @@ public class HopperListeners implements Listener {
 
             if (!(source.getHolder() instanceof org.bukkit.block.Hopper)) return;
 
-            if (source.getLocation().getBlock().getRelative(BlockFace.DOWN).equals(event.getDestination().getLocation().getBlock())) return;
-
             if (instance.isLiquidtanks() && net.arcaniax.liquidtanks.object.LiquidTankAPI.isLiquidTank(event.getDestination().getLocation()))
                 return;
 
             Hopper hopper = instance.getHopperManager().getHopper(source.getLocation());
-            if ((hopper.getLinkedBlocks() == null || hopper.getLinkedBlocks().isEmpty())) {
-                hopper.clearLinkedBlocks();
-                Location location = event.getDestination().getLocation();
-                if (location.getBlock() instanceof InventoryHolder)
-                    hopper.addLinkedBlock(location);
-            }
+
+            if (!(event.getDestination().getLocation().getBlock().getState() instanceof InventoryHolder)) return;
+
+            hopper.clearLinkedBlocks();
+            hopper.addLinkedBlock(event.getDestination().getLocation());
+
+            event.setCancelled(true);
+
             event.setCancelled(true);
         } catch (Exception ee) {
             Debugger.runReport(ee);
diff --git a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/Storage.java b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/Storage.java
index 1caabb1..291b622 100644
--- a/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/Storage.java
+++ b/EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/storage/Storage.java
@@ -18,7 +18,7 @@ public abstract class Storage {
     public Storage(EpicHoppersPlugin instance) {
         this.instance = instance;
         this.dataFile = new ConfigWrapper(instance, "", "data.yml");
-        this.dataFile.createNewFile(null, "EpicSpawners Data File");
+        this.dataFile.createNewFile(null, "EpicHoppers Data File");
         this.dataFile.getConfig().options().copyDefaults(true);
         this.dataFile.saveConfig();
     }