diff --git a/server/gameserver/base_agent.cc b/server/gameserver/base_agent.cc
index fd39e77e..8e072dc1 100644
--- a/server/gameserver/base_agent.cc
+++ b/server/gameserver/base_agent.cc
@@ -318,11 +318,13 @@ int BaseAgent::GetUseableSkill(Creature* target)
         return -1;
     }
     #endif
-    #if 0
+#ifdef DEBUG
+    #if 1
     if (GetOwner()->IsHuman()) {
         return -1;
     }
     #endif
+#endif
     Skill* skill = GetOwner()->GetMainSkill();
     if (skill && GetOwner()->CanUseSkill(skill->GetSkillId())) {
         if (skill->GetMinorType()) {
diff --git a/server/gameserver/skillhelper.cc b/server/gameserver/skillhelper.cc
index 73934a1c..8e28d7ec 100644
--- a/server/gameserver/skillhelper.cc
+++ b/server/gameserver/skillhelper.cc
@@ -39,18 +39,23 @@ void SkillHelper::Init()
         }
     }
     magic_skill_hash_[MAGIC_60100_1_BOSS] = 60101;
-    magic_skill_hash_[MAGIC_60100_2_BOSS] = 60102;
-    magic_skill_hash_[MAGIC_60100_3_BOSS] = 60103;
+    magic_skill_hash_[MAGIC_60100_2_BOSS] = 60111;
+    magic_skill_hash_[MAGIC_60100_3_BOSS] = 60121;
 
     skill_magic_hash_[60101] = MAGIC_60100_1_BOSS;
-    skill_magic_hash_[60102] = MAGIC_60100_2_BOSS;
-    skill_magic_hash_[60103] = MAGIC_60100_3_BOSS;
+    skill_magic_hash_[60111] = MAGIC_60100_2_BOSS;
+    skill_magic_hash_[60121] = MAGIC_60100_3_BOSS;
 }
 
 void SkillHelper::GetMagicIdAndBaseSkillId(int skill_id, int& magic_id, int& base_skill_id)
 {
     magic_id = 0;
-    base_skill_id = 0;
+    base_skill_id = skill_id;
+    if (skill_magic_hash_.find(skill_id) != skill_magic_hash_.end()) {
+        magic_id = skill_magic_hash_[skill_id];
+        base_skill_id = skill_id;
+        return;
+    }
     for (auto& pair : skill_magic_hash_) {
 #if 1
         if (skill_id - pair.first >= 0 &&