diff --git a/server/gameserver/buff/callfunc.cc b/server/gameserver/buff/callfunc.cc
index 91f71376..21901f91 100644
--- a/server/gameserver/buff/callfunc.cc
+++ b/server/gameserver/buff/callfunc.cc
@@ -443,7 +443,7 @@ void CallFuncBuff::ProcLightCircle()
                      Buff* buff = owner->GetBuffByUniId(context->keep_buff_uniid);
                      if (buff) {
                          buff->res_scale = 2.0f;
-                         buff->res_scale_frameno = room->GetFrameNo();
+                         buff->res_scale_frameno = owner->room->GetFrameNo();
                      }
                      check_cb();
                  } else if (kDeactiveDjsSkillTimerEvent == event) {
@@ -452,7 +452,7 @@ void CallFuncBuff::ProcLightCircle()
                      Buff* buff = owner->GetBuffByUniId(context->keep_buff_uniid);
                      if (buff) {
                          buff->res_scale = 1.0f;
-                         buff->res_scale_frameno = room->GetFrameNo();
+                         buff->res_scale_frameno = owner->room->GetFrameNo();
                      }
                      check_cb();
                  }
diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc
index 3cfa3890..ac1e03af 100644
--- a/server/gameserver/skill.cc
+++ b/server/gameserver/skill.cc
@@ -305,6 +305,9 @@ void Skill::InitPassiveSkill()
         }
         break;
     }
+    for (int buff_id : meta->_buff_list) {
+        owner->TryAddBuff(owner, buff_id, meta);
+    }
 }
 
 void Skill::Proc30101HL()