diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 1132aa69..0037160e 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1719,17 +1719,17 @@ void Creature::CheckSpecObject(int new_poly_flags)
                 }
                 if ((1 << i) == SAMPLE_POLYFLAGS_GLASS) {
                     if (a8::HasBitFlag(poly_ext_flags_, i)) {
-                        RemoveBuffById(8058);
+                        ClearBuffById(8058);
                         RemoveBuffById(kInGrassBuffId);
                     } else {
                         TryAddBuffAndSetTime(this, kInGrassBuffId, 9999999);
                         if (battling_grass_hide_delay_timer.expired() &&
                             (room->GetFrameNo() - last_battling_frameno) * FRAME_RATE_MS <
                             mt::Param::s().battling_disengage_time) {
-                            int dur_time = mt::Param::s().battling_grass_hide_delay_time * FRAME_RATE_MS;
+                            int dur_time = mt::Param::s().battling_grass_hide_delay_time;
                             battling_grass_hide_delay_timer = room->xtimer.SetTimeoutWpEx
                                 (
-                                 dur_time / SERVER_FRAME_RATE,
+                                 dur_time / FRAME_RATE_MS,
                                  [this] (int event, const a8::Args* args)
                                  {
                                      if (a8::TIMER_EXEC_EVENT == event) {