diff --git a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java b/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java
index 04ee15a..3675b3f 100644
--- a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java	
+++ b/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java	
@@ -6,6 +6,7 @@ import net.simon987.server.assembly.CPU;
 import net.simon987.server.event.CpuInitialisationEvent;
 import net.simon987.server.event.GameEvent;
 import net.simon987.server.event.GameEventListener;
+import net.simon987.server.game.objects.HardwareHost;
 
 public class CpuInitialisationListener implements GameEventListener {
 
@@ -18,6 +19,8 @@ public class CpuInitialisationListener implements GameEventListener {
     public void handle(GameEvent event) {
 
         CPU cpu = (CPU) event.getSource();
+        HardwareHost cubot = (HardwareHost) ((CpuInitialisationEvent) event).getUnit();
+        cpu.setHardwareHost(cubot);
 
         RandomNumberGenerator rngHW = new RandomNumberGenerator();
         rngHW.setCpu(cpu);