diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc
index 97a4b94c..59b2ed1c 100644
--- a/server/gameserver/android.cc
+++ b/server/gameserver/android.cc
@@ -82,6 +82,9 @@ void Android::InternalUpdate(int delta_time)
     if (a8::HasBitFlag(status, CS_Disable)) {
         return;
     }
+    if (poisoning) {
+        UpdatePoisoning();
+    }
     if (action_type != AT_None) {
         UpdateAction();
     }
diff --git a/server/gameserver/buff/cond_add.cc b/server/gameserver/buff/cond_add.cc
index e0301a1b..53cad473 100644
--- a/server/gameserver/buff/cond_add.cc
+++ b/server/gameserver/buff/cond_add.cc
@@ -68,6 +68,9 @@ void CondAddBuff::ProcBulletHit()
           {
               IBullet* bullet = args.Get<IBullet*>(0);
               Creature* c = args.Get<Creature*>(0);
+              if (is_same_target ) {
+
+              }
           })
          );
 }