diff --git a/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java
index c2931962..2ea8fba6 100644
--- a/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java
+++ b/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java
@@ -65,6 +65,7 @@ public final class VxlanBlockEntity extends ModBlockEntity implements NetworkInt
 
     @Override
     protected void onUnload(final boolean isRemove) {
+        adjacentBlockInterfaces[0] = null;
         TunnelManager.instance().unregisterVti(vti);
 
         super.onUnload(isRemove);
@@ -74,7 +75,8 @@ public final class VxlanBlockEntity extends ModBlockEntity implements NetworkInt
     public void onLoad() {
         super.onLoad();
 
-        TunnelManager.instance().registerVti(vti, this);
+        System.out.println("Tunnel VTI: " + vti);
+        adjacentBlockInterfaces[0] = TunnelManager.instance().registerVti(vti, this);
     }
 
     ///////////////////////////////////////////////////////////////////
diff --git a/src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java b/src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java
index 3d9b7770..88fbb3ec 100644
--- a/src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java
+++ b/src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java
@@ -93,8 +93,10 @@ public class TunnelManager {
         DatagramPacket packet = new DatagramPacket(buffer, buffer.length, this.remoteHost, this.remotePort);
     }
 
-    public void registerVti(int vti, NetworkInterface iface) {
-        tunnels.put(vti, new TunnelInterface(vti, iface));
+    public NetworkInterface registerVti(int vti, NetworkInterface iface) {
+        TunnelInterface tuniface = new TunnelInterface(vti, iface);
+        tunnels.put(vti, tuniface);
+        return tuniface;
     }
 
     public void unregisterVti(int vti) {
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index e46ae304..204ca3bf 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -17,7 +17,7 @@ This mod uses the Terminus Font under the Open Font License. The full license ca
 [[dependencies.oc2]]
 modId = "forge"
 mandatory = true
-versionRange = "[39.0.63,)"
+versionRange = "[39.0.59,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.oc2]]