diff --git a/src/p_enemy.c b/src/p_enemy.c
index 3c59c40f5..76f6b3159 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -3558,8 +3558,6 @@ void A_BubbleCheck(mobj_t *actor)
 //
 void A_AttractChase(mobj_t *actor)
 {
-	fixed_t z;
-
 #ifdef HAVE_BLUA
 	if (LUA_CallAction("A_AttractChase", actor))
 		return;
@@ -3603,12 +3601,11 @@ void A_AttractChase(mobj_t *actor)
 			{
 				fixed_t offz = FixedMul(80*actor->target->scale, FINESINE(FixedAngle((90 - (9 * abs(10 - actor->extravalue1))) << FRACBITS) >> ANGLETOFINESHIFT));
 				//P_SetScale(actor, (actor->destscale = actor->target->scale));
-				z = actor->target->z;
-				if (( actor->eflags & MFE_VERTICALFLIP ))
-					z -= actor->height + offz;
-				else
-					z += actor->target->height + offz;
-				P_TeleportMove(actor, actor->target->x, actor->target->y, z);
+				actor->z = actor->target->z;
+				K_MatchGenericExtraFlags(actor, actor->target);
+				P_TeleportMove(actor, actor->target->x, actor->target->y,
+						actor->z +
+						( actor->target->height + offz )* P_MobjFlip(actor));
 				actor->extravalue1++;
 			}
 		}
@@ -3635,15 +3632,12 @@ void A_AttractChase(mobj_t *actor)
 				fixed_t dist = (actor->target->radius/4) * (16 - actor->extravalue1);
 
 				P_SetScale(actor, (actor->destscale = actor->target->scale - ((actor->target->scale/14) * actor->extravalue1)));
-				z = actor->target->z;
-				if (( actor->eflags & MFE_VERTICALFLIP ))
-					z += actor->target->height - actor->height - 24 * actor->target->scale;
-				else
-					z += 24 * actor->target->scale;
+				actor->z = actor->target->z;
+				K_MatchGenericExtraFlags(actor, actor->target);
 				P_TeleportMove(actor,
 					actor->target->x + FixedMul(dist, FINECOSINE(actor->angle >> ANGLETOFINESHIFT)),
 					actor->target->y + FixedMul(dist, FINESINE(actor->angle >> ANGLETOFINESHIFT)),
-					z);
+					actor->z + actor->target->scale * 24 * P_MobjFlip(actor));
 
 				actor->angle += ANG30;
 				actor->extravalue1++;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index b1d862718..f54eca41e 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8744,18 +8744,13 @@ void P_MobjThinker(mobj_t *mobj)
 				return;
 			}
 
+			mobj->z = mobj->target->z;
+
 			K_MatchGenericExtraFlags(mobj, mobj->target);
-			{
-				fixed_t z;
-				z = mobj->target->z;
-				if (( mobj->eflags & MFE_VERTICALFLIP ))
-					z -= mobj->height;
-				else
-					z += mobj->target->height;
-				P_TeleportMove(mobj, mobj->target->x + FINECOSINE(mobj->angle >> ANGLETOFINESHIFT),
-						mobj->target->y + FINESINE(mobj->angle >> ANGLETOFINESHIFT),
-						z);
-			}
+
+			P_TeleportMove(mobj, mobj->target->x + FINECOSINE(mobj->angle >> ANGLETOFINESHIFT),
+					mobj->target->y + FINESINE(mobj->angle >> ANGLETOFINESHIFT),
+					mobj->z + mobj->target->height * P_MobjFlip(mobj));
 			break;
 		case MT_TIREGREASE:
 			if (!mobj->target || P_MobjWasRemoved(mobj->target) || !mobj->target->player