diff --git a/src/p_mobj.c b/src/p_mobj.c
index dea4a7a4d..a6812ff01 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7833,7 +7833,8 @@ void P_MobjThinker(mobj_t *mobj)
 						boolean dojump = false, targonground, love, makeheart = false;
 						if (mobj->target != player->mo)
 							P_SetTarget(&mobj->target, player->mo);
-						targonground = (P_IsObjectOnGround(mobj->target) && (player->panim == PA_IDLE || player->panim == PA_WALK || player->panim == PA_RUN));
+						// Tatsuru: Don't try to hug them if they're above or below you!
+						targonground = (P_IsObjectOnGround(mobj->target) && (player->panim == PA_IDLE || player->panim == PA_WALK || player->panim == PA_RUN) && player->mo->z == mobj->z);
 						love = (player->skin == 0 || player->skin == 5);
 
 						switch (stat)