diff --git a/src/main/java/org/ultramine/server/tools/ButtonCommand.java b/src/main/java/org/ultramine/server/tools/ButtonCommand.java
index bca42d4..c1d32b2 100644
--- a/src/main/java/org/ultramine/server/tools/ButtonCommand.java
+++ b/src/main/java/org/ultramine/server/tools/ButtonCommand.java
@@ -13,6 +13,7 @@
 import org.ultramine.server.ConfigurationHandler;
 import org.ultramine.server.PermissionHandler;
 import org.ultramine.server.chunk.ChunkHash;
+import org.ultramine.server.event.SetBlockEvent;
 import org.ultramine.server.util.MinecraftUtil;
 import org.ultramine.server.util.YamlConfigProvider;
 
@@ -21,9 +22,7 @@
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Blocks;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.ChatStyle;
@@ -31,7 +30,6 @@
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import net.minecraftforge.event.world.BlockEvent;
 
 @SideOnly(Side.SERVER)
 public class ButtonCommand
@@ -140,9 +138,6 @@
 		EntityPlayerMP player = ctx.getSenderAsPlayer();
 		MovingObjectPosition obj = MinecraftUtil.getMovingObjectPosition(player);
 		ctx.check(obj.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK, "command.buttoncommand.fail.noblock");
-		Block block = player.worldObj.getBlock(obj.blockX, obj.blockY, obj.blockZ);
-		System.out.println(Block.blockRegistry.getNameForObject(block));
-		ctx.check(block == Blocks.stone_button || block == Blocks.wooden_button || block == Blocks.standing_sign || block == Blocks.wall_sign, "command.buttoncommand.fail.noblock");
 		if(ctx.getAction().startsWith("c") || ctx.getAction().startsWith("p"))
 		{
 			ctx.check(!instance.exists(player.dimension, obj.blockX, obj.blockY, obj.blockZ), "command.buttoncommand.fail.already");
@@ -189,10 +184,9 @@
 	}
 	
 	@SubscribeEvent(priority = EventPriority.LOW)
-	public void onBreakEvent(BlockEvent.BreakEvent e)
+	public void onBreakEvent(SetBlockEvent e)
 	{
-		if(e.block == Blocks.stone_button || e.block == Blocks.wooden_button || e.block == Blocks.standing_sign || e.block == Blocks.wall_sign)
-			remove(e.world.provider.dimensionId, e.x, e.y, e.z);
+		remove(e.world.provider.dimensionId, e.x, e.y, e.z);
 	}
 	
 	public static class ButtomCMDs
diff --git a/src/main/resources/assets/ultramine/lang/en_US.lang b/src/main/resources/assets/ultramine/lang/en_US.lang
index 0b6b129..0ade4ed 100644
--- a/src/main/resources/assets/ultramine/lang/en_US.lang
+++ b/src/main/resources/assets/ultramine/lang/en_US.lang
@@ -198,7 +198,7 @@
 command.gm.description=Toggle gamemode
 
 command.buttoncommand.usage=/buttoncommand <create> <commands ...> OR /buttoncommand <permission> <commands ...> OR /buttoncommand <remove|get>
-command.buttoncommand.description=Binds server command to button or sign in world
+command.buttoncommand.description=Binds server command to any block
 command.buttoncommand.fail.noblock=Button is not selected
 command.buttoncommand.fail.already=Button is already created. Use /buttoncommand remove
 command.buttoncommand.fail.none=ButtonCommand is not created for selected button
diff --git a/src/main/resources/assets/ultramine/lang/ru_RU.lang b/src/main/resources/assets/ultramine/lang/ru_RU.lang
index 60891b7..5c857c9 100644
--- a/src/main/resources/assets/ultramine/lang/ru_RU.lang
+++ b/src/main/resources/assets/ultramine/lang/ru_RU.lang
@@ -198,7 +198,7 @@
 command.gm.description=Переключает режим игры
 
 command.buttoncommand.usage=/buttoncommand <create> <команды ...> ИЛИ /buttoncommand <permission> <команды ...> ИЛИ /buttoncommand <remove|get>
-command.buttoncommand.description=Устанавливает серверную команду на кнопку или табличку в мире
+command.buttoncommand.description=Устанавливает серверную команду на любой блок
 command.buttoncommand.fail.noblock=Кнопка не выбрана, наведите курсор на кнопку
 command.buttoncommand.fail.already=Кнопка уже создана. Используйте /buttoncommand remove
 command.buttoncommand.fail.none=ButtonCommand не установлен на выбранную кнопку