diff --git a/src/monst.c b/src/monst.c
index 489d9b41d8..9e02051ca0 100644
--- a/src/monst.c
+++ b/src/monst.c
@@ -1280,7 +1280,7 @@ NEARDATA struct permonst mons[] = {
 	A(ATTK(AT_CLAW, AD_PHYS, 4, 4),
 	  NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(900, 400, 0, MS_SILENT, MZ_LARGE), 0, 0,
-	M1_ANIMAL|M1_FLY|M1_SEE_INVIS,
+	M1_ANIMAL|M1_HUMANOID|M1_FLY|M1_SEE_INVIS,
 	M2_WANDER|M2_STALK|M2_HOSTILE|M2_STRONG, M3_INFRAVISION, CLR_WHITE),
     MON("air elemental", S_ELEMENTAL,
 	LVL(8, 36, 2, 30, 0), (G_NOCORPSE|1),
diff --git a/src/polyself.c b/src/polyself.c
index 6436def123..2365762c8b 100644
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -1313,7 +1313,8 @@ int part;
 	if (mptr->mlet == S_JELLY || mptr->mlet == S_PUDDING ||
 		mptr->mlet == S_BLOB || mptr == &mons[PM_JELLYFISH])
 	    return jelly_parts[part];
-	if (mptr->mlet == S_VORTEX || mptr->mlet == S_ELEMENTAL)
+	if (mptr->mlet == S_VORTEX ||
+	    (mptr->mlet == S_ELEMENTAL && mptr != &mons[PM_STALKER]))
 	    return vortex_parts[part];
 	if (mptr->mlet == S_FUNGUS)
 	    return fungus_parts[part];