diff --git a/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java b/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java
index e16b62e7..7fc376fe 100644
--- a/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java
+++ b/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java
@@ -20,9 +20,8 @@ public class SpeedWailaDataProvider extends BasePartWailaDataProvider {
     @Override
     public List<String> getWailaBody(final IPart part, final List<String> currentToolTip,
             final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
-        if (part instanceof FCSharedFluidBus) {
-            part.readFromNBT(accessor.getNBTData());
-            currentToolTip.add(Tooltip.partFluidBusFormat(((FCSharedFluidBus) part).calculateAmountToSend() / 5));
+        if (accessor.getNBTData().hasKey("BusSpeed")) {
+            currentToolTip.add(Tooltip.partFluidBusFormat(accessor.getNBTData().getInteger("BusSpeed")));
         }
         return currentToolTip;
     }
@@ -30,8 +29,8 @@ public class SpeedWailaDataProvider extends BasePartWailaDataProvider {
     @Override
     public NBTTagCompound getNBTData(final EntityPlayerMP player, final IPart part, final TileEntity te,
             final NBTTagCompound tag, final World world, final int x, final int y, final int z) {
-        if (part instanceof FCSharedFluidBus) {
-            part.writeToNBT(tag);
+        if (part instanceof FCSharedFluidBus bus) {
+            tag.setInteger("BusSpeed", bus.calculateAmountToSend() / 5);
         }
         return tag;
     }