diff --git a/src/engine/gameManager/ItemManager.java b/src/engine/gameManager/ItemManager.java
index 825843b1..e90d8b62 100644
--- a/src/engine/gameManager/ItemManager.java
+++ b/src/engine/gameManager/ItemManager.java
@@ -190,7 +190,10 @@ public enum ItemManager {
         if (!validForSkills(item, abstractCharacter.getSkills()))
             return false;
 
-        if (canCharacterEquip(item, abstractCharacter) == false)
+        if (!ValidRace(item, abstractCharacter.absRace))
+            return false;
+
+        if (!ValidClass(item, abstractCharacter.absBaseClass,abstractCharacter.absPromotionClass))
             return false;
 
         //players can't wear 0 value items.
diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java
index 6b4c35db..07f50a0d 100644
--- a/src/engine/objects/PlayerCharacter.java
+++ b/src/engine/objects/PlayerCharacter.java
@@ -2193,7 +2193,7 @@ public class PlayerCharacter extends AbstractCharacter {
     public boolean setPromotionClass(int value) {
 
         PromotionClass promotionClass = PromotionClass.GetPromtionClassFromCache(value);
-
+        this.absPromotionClass = mbEnums.ClassType.valueOf(this.getPromotionClass().getName());
         if (promotionClass == null)
             return false;