diff --git a/src/p_mobj.c b/src/p_mobj.c
index 90a3ad4c3..2951048ec 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2090,9 +2090,9 @@ boolean P_CheckDeathPitCollide(mobj_t *mo)
 		const sectorflags_t flags = mo->subsector->sector->flags;
 
 		return (
-			   (mo->z <= mo->subsector->sector->floorheight
+			   (mo->z <= mo->floorz
 				&& ((flags & MSF_TRIGGERSPECIAL_HEADBUMP) || !flipped) && (flags & MSF_FLIPSPECIAL_FLOOR))
-			|| (mo->z + mo->height >= mo->subsector->sector->ceilingheight
+			|| (mo->z + mo->height >= mo->ceilingz
 				&& ((flags & MSF_TRIGGERSPECIAL_HEADBUMP) || flipped) && (flags & MSF_FLIPSPECIAL_CEILING))
 		);
 	}