diff --git a/src/MobManager.cpp b/src/MobManager.cpp
index b35ba14..7da4924 100644
--- a/src/MobManager.cpp
+++ b/src/MobManager.cpp
@@ -1779,7 +1779,7 @@ bool doDamageNDebuff(Mob *mob, sSkillResult_Damage_N_Debuff *respdata, int i, in
             pkt.eTBU = 1; // eTimeBuffUpdate
             pkt.eTBT = 2;
             pkt.iConditionBitFlag = plr->iConditionBitFlag |= bitFlag;
-            pkt.TimeBuff.iValue = amount;
+            pkt.TimeBuff.iValue = amount * 5;
             sock->sendPacket((void*)&pkt, P_FE2CL_PC_BUFF_UPDATE, sizeof(sP_FE2CL_PC_BUFF_UPDATE));
         }
 
diff --git a/src/NanoManager.cpp b/src/NanoManager.cpp
index 8ac7804..953c89b 100644
--- a/src/NanoManager.cpp
+++ b/src/NanoManager.cpp
@@ -7,6 +7,8 @@
 #include "MissionManager.hpp"
 #include "GroupManager.hpp"
 
+#include <cmath>
+
 std::map<int32_t, NanoData> NanoManager::NanoTable;
 std::map<int32_t, NanoTuning> NanoManager::NanoTunings;
 std::map<int32_t, SkillData> NanoManager::SkillTable;
@@ -712,7 +714,7 @@ bool doDamage(CNSocket *sock, sSkillResult_Damage *respdata, int i, int32_t targ
 
     Player *plr = PlayerManager::getPlayer(sock);
 
-    int damage = MobManager::hitMob(sock, mob, PC_MAXHEALTH(plr->level) * amount / 2000 + mob->appearanceData.iHP * amount / 2000);
+    int damage = MobManager::hitMob(sock, mob, std::max(PC_MAXHEALTH(plr->level) * amount / 1000, mob->maxHealth * amount / 1000));
 
     respdata[i].eCT = 4;
     respdata[i].iDamage = damage;