diff --git a/gradle.properties b/gradle.properties
index c48e89d..c8c4d6e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 mc_version=1.18.2
 
-mod_version = 2.0.6-1.18.2
+mod_version = 2.0.7-1.18.2
 
 create_version = 0.5.+
 flywheel_version = 0.6.+
diff --git a/src/main/java/com/forsteri/createendertransmission/blocks/energyTransmitter/EnergyTransmitterBlockEntity.java b/src/main/java/com/forsteri/createendertransmission/blocks/energyTransmitter/EnergyTransmitterBlockEntity.java
index 1489169..0bc9988 100644
--- a/src/main/java/com/forsteri/createendertransmission/blocks/energyTransmitter/EnergyTransmitterBlockEntity.java
+++ b/src/main/java/com/forsteri/createendertransmission/blocks/energyTransmitter/EnergyTransmitterBlockEntity.java
@@ -67,7 +67,7 @@ public List<KineticBlockEntity> getConnectedTransmitters(){
         ArrayList<KineticBlockEntity> list = new ArrayList<>(List.of(this));
 
         channel.put(
-                this.getTileData().getString("password"),
+                this.getPassword(),
                 list
         );
 
@@ -102,8 +102,9 @@ public void afterReload(){
 
     @Override
     public float propagateRotationTo(KineticBlockEntity target, BlockState stateFrom, BlockState stateTo, BlockPos diff, boolean connectedViaAxes, boolean connectedViaCogs) {
-        return (target.getTileData().getInt("channel") == this.getTileData().getInt("channel")
-                && target.getTileData().getString("password").equals(this.getTileData().getString("password"))) ? 1f : 0f;
+        return (target.getTileData().getInt("channel") == getChannel()
+                && target.getTileData().getString("password").equals(getPassword())
+                && target.getBlockState().getBlock() instanceof EnergyTransmitterBlock) ? 1f : 0f;
     }
 
 }