diff --git a/gradle.properties b/gradle.properties
index ba70594..100be05 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,6 +10,6 @@ loader_version=0.14.19-babric.3-bta
 halplibe_version=3.1.4
 
 # Mod
-mod_version=1.2.12
+mod_version=1.2.13
 mod_group=net.pedroricardo
 mod_name=commander
diff --git a/output/production/commander-bta.main/fabric.mod.json b/output/production/commander-bta.main/fabric.mod.json
index 55b182b..8a4a7c4 100644
--- a/output/production/commander-bta.main/fabric.mod.json
+++ b/output/production/commander-bta.main/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "commander",
-  "version": "1.2.11",
+  "version": "1.2.12",
 
   "name": "Commander",
   "description": "This mod overhauls the command system.",
diff --git a/output/production/commander-bta.main/net/pedroricardo/commander/CommanderHelper.class b/output/production/commander-bta.main/net/pedroricardo/commander/CommanderHelper.class
index d6aeb73..614369f 100644
Binary files a/output/production/commander-bta.main/net/pedroricardo/commander/CommanderHelper.class and b/output/production/commander-bta.main/net/pedroricardo/commander/CommanderHelper.class differ
diff --git a/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand$CloneMode.class b/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand$CloneMode.class
index 6d81e11..8f74067 100644
Binary files a/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand$CloneMode.class and b/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand$CloneMode.class differ
diff --git a/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand$WorldAndPosition.class b/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand$WorldAndPosition.class
index e89ddc9..f95f933 100644
Binary files a/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand$WorldAndPosition.class and b/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand$WorldAndPosition.class differ
diff --git a/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand.class b/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand.class
index 88ed419..16c8d2a 100644
Binary files a/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand.class and b/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/CloneCommand.class differ
diff --git a/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/FillCommand.class b/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/FillCommand.class
index 461046d..30875b0 100644
Binary files a/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/FillCommand.class and b/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/FillCommand.class differ
diff --git a/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/SetBlockCommand.class b/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/SetBlockCommand.class
index 8782062..223eecf 100644
Binary files a/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/SetBlockCommand.class and b/output/production/commander-bta.main/net/pedroricardo/commander/content/commands/SetBlockCommand.class differ
diff --git a/src/main/java/net/pedroricardo/commander/content/commands/CloneCommand.java b/src/main/java/net/pedroricardo/commander/content/commands/CloneCommand.java
index 1db99d0..a3f2780 100644
--- a/src/main/java/net/pedroricardo/commander/content/commands/CloneCommand.java
+++ b/src/main/java/net/pedroricardo/commander/content/commands/CloneCommand.java
@@ -177,9 +177,7 @@ public static int clone(CommanderCommandSource source, WorldAndPosition start, W
                 if (destination.getWorld().getBlockId(offsetDestinationX, offsetDestinationY, offsetDestinationZ) != entry.getValue().getBlockId() || destination.getWorld().getBlockMetadata(offsetDestinationX, offsetDestinationY, offsetDestinationZ) != entry.getValue().getMetadata()) ++clonedBlocks;
                 destination.getWorld().setBlockWithNotify(offsetDestinationX, offsetDestinationY, offsetDestinationZ, entry.getValue().getBlockId());
                 destination.getWorld().setBlockMetadataWithNotify(offsetDestinationX, offsetDestinationY, offsetDestinationZ, entry.getValue().getMetadata());
-                if (entry.getValue().getTileEntity() != null) {
-                    CommanderHelper.setTileEntity(destination.getWorld(), offsetDestinationX, offsetDestinationY, offsetDestinationZ, entry.getValue().getTileEntity());
-                }
+                CommanderHelper.setTileEntity(destination.getWorld(), offsetDestinationX, offsetDestinationY, offsetDestinationZ, entry.getValue().getTileEntity());
             }
         }
         destination.getWorld().editingBlocks = false;
diff --git a/src/main/java/net/pedroricardo/commander/content/commands/FillCommand.java b/src/main/java/net/pedroricardo/commander/content/commands/FillCommand.java
index 40e5af0..d80306b 100644
--- a/src/main/java/net/pedroricardo/commander/content/commands/FillCommand.java
+++ b/src/main/java/net/pedroricardo/commander/content/commands/FillCommand.java
@@ -127,6 +127,7 @@ public static int fillReplace(CommanderCommandSource source, World world, Intege
                     if (filter == null || (world.getBlockId(x, y, z) == filter.getBlockId() && world.getBlockMetadata(x, y, z) == filter.getMetadata() && (!filter.getTag().getValue().isEmpty() || CommanderHelper.blockEntitiesAreEqual(CommanderHelper.tagFrom(world.getBlockTileEntity(x, y, z)), filter.getTag())))) {
                         world.setBlockWithNotify(x, y, z, block.getBlockId());
                         world.setBlockMetadataWithNotify(x, y, z, block.getMetadata());
+                        CommanderHelper.setTileEntity(world, x, y, z, block.getTag());
                     }
                 }
             }
@@ -156,6 +157,7 @@ public static int fillHollow(CommanderCommandSource source, World world, Integer
                     }
                     world.setBlockWithNotify(x, y, z, isOutline ? block.getBlockId() : 0);
                     world.setBlockMetadataWithNotify(x, y, z, isOutline ? block.getMetadata() : 0);
+                    CommanderHelper.setTileEntity(world, x, y, z, block.getTag());
                 }
             }
         }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 8a4a7c4..a2e35a1 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "commander",
-  "version": "1.2.12",
+  "version": "1.2.13",
 
   "name": "Commander",
   "description": "This mod overhauls the command system.",