diff --git a/src/main/java/com/songoda/epicfurnaces/furnace/Furnace.java b/src/main/java/com/songoda/epicfurnaces/furnace/Furnace.java
index 0e46e73..501e4c4 100644
--- a/src/main/java/com/songoda/epicfurnaces/furnace/Furnace.java
+++ b/src/main/java/com/songoda/epicfurnaces/furnace/Furnace.java
@@ -172,7 +172,6 @@ public class Furnace {
     }
 
     private void syncName() {
-        if (!(location.getBlock() instanceof Furnace)) return;
         org.bukkit.block.Furnace furnace = (org.bukkit.block.Furnace) location.getBlock().getState();
         if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_10))
             furnace.setCustomName(Methods.formatName(level.getLevel(), uses, false));
diff --git a/src/main/java/com/songoda/epicfurnaces/tasks/FurnaceTask.java b/src/main/java/com/songoda/epicfurnaces/tasks/FurnaceTask.java
index 53d1e26..1fe570f 100644
--- a/src/main/java/com/songoda/epicfurnaces/tasks/FurnaceTask.java
+++ b/src/main/java/com/songoda/epicfurnaces/tasks/FurnaceTask.java
@@ -76,20 +76,19 @@ public class FurnaceTask extends BukkitRunnable {
 
             if (block.getType() == Material.AIR || block.getRelative(BlockFace.UP).getType() != Material.AIR) continue;
 
+            if (block.getType() == Material.SNOW)
+                block.setType(Material.AIR);
+            else if (block.getType() == Material.ICE || block.getType() == Material.PACKED_ICE)
+                block.setType(Material.WATER);
+            else
+               continue;
 
             if (doParticles) {
-
                 float xx = (float) (0 + (Math.random() * .75));
                 float yy = (float) (0 + (Math.random() * 1));
                 float zz = (float) (0 + (Math.random() * .75));
-                
                 CompatibleParticleHandler.spawnParticles(CompatibleParticleHandler.ParticleType.SMOKE_NORMAL, location, 25, xx, yy, zz, 0);
             }
-            if (block.getType() == Material.SNOW) {
-                block.setType(Material.AIR);
-            } else if (block.getType() == Material.ICE || block.getType() == Material.PACKED_ICE) {
-                block.setType(Material.WATER);
-            }
         }
     }