diff --git a/CHANGELOG.md b/CHANGELOG.md
index d038db472..ff0bbdcd7 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 **Features**
 - Added fluid storage
 - Energy usage of Wireless Grid is now configurable
+- Wireless Transmitter can now only be placed on Cable
 
 ### 0.8.20
 **Bugfixes**
diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java
index af2496aab..32af66cba 100755
--- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java
+++ b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java
@@ -14,7 +14,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
-import refinedstorage.tile.TileNode;
+import refinedstorage.tile.TileCable;
 import refinedstorage.tile.TileWirelessTransmitter;
 
 public class BlockWirelessTransmitter extends BlockNode {
@@ -65,10 +65,7 @@ public class BlockWirelessTransmitter extends BlockNode {
 
     @Override
     public boolean canPlaceBlockAt(World world, BlockPos pos) {
-        BlockPos downPos = pos.offset(EnumFacing.DOWN);
-        IBlockState down = world.getBlockState(downPos);
-
-        return down.getBlock().canPlaceTorchOnTop(down, world, downPos) || (world.getTileEntity(downPos) instanceof TileNode && !(world.getTileEntity(downPos) instanceof TileWirelessTransmitter));
+        return world.getTileEntity(pos.offset(EnumFacing.DOWN)) instanceof TileCable;
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/gui/grid/stack/ClientStackFluid.java b/src/main/java/refinedstorage/gui/grid/stack/ClientStackFluid.java
index 21915a964..e306a0a72 100755
--- a/src/main/java/refinedstorage/gui/grid/stack/ClientStackFluid.java
+++ b/src/main/java/refinedstorage/gui/grid/stack/ClientStackFluid.java
@@ -51,7 +51,7 @@ public class ClientStackFluid implements IClientStack {
     public void draw(GuiBase gui, int x, int y, boolean isOverWithShift) {
         GuiBase.FLUID_RENDERER.draw(gui.mc, x, y, stack);
 
-        gui.drawQuantity(x, y, String.format(Locale.US, "%.1f", (float) stack.amount / 1000).replace(".0", "") + "B");
+        gui.drawQuantity(x, y, String.format(Locale.US, "%.1f", (float) stack.amount / 1000).replace(".0", ""));
     }
 
     @Override