diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
index e8aa6536..e13f1ea2 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
@@ -147,7 +147,7 @@ public class MiscDisguise extends TargetedDisguise {
     public int getData() {
         switch (getType()) {
             case FALLING_BLOCK:
-                return ((FallingBlockWatcher) getWatcher()).getBlock().getDurability();
+                return ((FallingBlockWatcher) getWatcher()).getBlockCombinedId();
             case PAINTING:
                 if (!NmsVersion.v1_19_R1.isSupported()) {
                     return ((PaintingWatcher) getWatcher()).getArt().getId();
diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java
index 1994d3ae..faaa331f 100644
--- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java
+++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java
@@ -32,11 +32,7 @@ public class FallingBlockWatcher extends FlagWatcher {
     public FallingBlockWatcher clone(Disguise disguise) {
         FallingBlockWatcher watcher = (FallingBlockWatcher) super.clone(disguise);
 
-        if (NmsVersion.v1_13.isSupported()) {
-            watcher.setBlockData(getBlockData().clone());
-        } else {
-            watcher.setBlock(getBlock().clone());
-        }
+        watcher.setBlockState(getBlockState().clone());
 
         return watcher;
     }