diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index bb8e3648fd..e76001e054 100644
--- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -305,22 +305,29 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 		}
 		
 		boolean success = false;
-		switch (stone.getItem().getCrystalType())
+		ElementalItemType stoneType = Elementals.getItemElemental(stone.getId())._type;
+		switch (item.getItem().getCrystalType())
 		{
 			case R:
 			{
-				success = Rnd.get(100) < 80;
-				break;
+				if ((stoneType == ElementalItemType.Stone) || (stoneType == ElementalItemType.Stone60) || (stoneType == ElementalItemType.Stone150) || (stoneType == ElementalItemType.Roughore))
+				{
+					success = Rnd.get(100) < 80;
+					break;
+				}
 			}
 			case R95:
 			case R99:
 			{
-				success = true;
-				break;
+				if ((stoneType == ElementalItemType.Stone) || (stoneType == ElementalItemType.Stone60) || (stoneType == ElementalItemType.Stone150) || (stoneType == ElementalItemType.Roughore))
+				{
+					success = true;
+					break;
+				}
 			}
 			default:
 			{
-				switch (Elementals.getItemElemental(stone.getId())._type)
+				switch (stoneType)
 				{
 					case Stone:
 					case Roughore: