diff --git a/src/p_enemy.cpp b/src/p_enemy.cpp
index 19b916956..047b11e9a 100644
--- a/src/p_enemy.cpp
+++ b/src/p_enemy.cpp
@@ -2856,6 +2856,10 @@ void A_Face(AActor *self, AActor *other, DAngle max_turn, DAngle max_pitch, DAng
 		{
 			target_z = other->Center();
 		}
+		if (source_z >= self->Top())
+		{
+			source_z = self->Center();
+		}
 
 		//Note there is no +32 on purpose. This is for customization sake. 
 		//If one doesn't want this behavior, just don't use FAF_BOTTOM.
diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu
index d4caef7e6..815ebd088 100644
--- a/wadsrc/static/language.enu
+++ b/wadsrc/static/language.enu
@@ -869,6 +869,15 @@ TAG_SKULLROD = "Hellstaff";
 TAG_PHOENIXROD = "Phoenix Rod";
 TAG_MACE = "Firemace";
 
+TAG_STAFFP = "Staff";
+TAG_GAUNTLETSP = "Gauntlets of the Necromancer";
+TAG_GOLDWANDP = "Elven Wand";
+TAG_CROSSBOWP = "Ethereal Crossbow";
+TAG_BLASTERP = "Dragon Claw";
+TAG_SKULLRODP = "Hellstaff";
+TAG_PHOENIXRODP = "Phoenix Rod";
+TAG_MACEP = "Firemace";
+
 // Item tags: Heretic artifacts
 TAG_ARTIEGG = "Morph Ovum";
 TAG_ARTIFIREBOMB = "Timebomb of the Ancients";