diff --git a/src/p_ceiling.cpp b/src/p_ceiling.cpp
index 40b0094ab..b45ded588 100644
--- a/src/p_ceiling.cpp
+++ b/src/p_ceiling.cpp
@@ -585,9 +585,9 @@ bool EV_CeilingCrushStop (int tag, bool remove)
 	return rtn;
 }
 
-bool EV_StopCeiling(int tag)
+bool EV_StopCeiling(int tag, line_t *line)
 {
-	FSectorTagIterator it(tag);
+	FSectorTagIterator it(tag, line);
 	while (int sec = it.Next())
 	{
 		if (level.sectors[sec].ceilingdata)
diff --git a/src/p_floor.cpp b/src/p_floor.cpp
index 580726155..d370cdccf 100644
--- a/src/p_floor.cpp
+++ b/src/p_floor.cpp
@@ -543,10 +543,10 @@ bool EV_DoFloor (DFloor::EFloor floortype, line_t *line, int tag,
 //
 //==========================================================================
 
-bool EV_FloorCrushStop (int tag)
+bool EV_FloorCrushStop (int tag, line_t *line)
 {
 	int secnum;
-	FSectorTagIterator it(tag);
+	FSectorTagIterator it(tag, line);
 	while ((secnum = it.Next()) >= 0)
 	{
 		sector_t *sec = &level.sectors[secnum];
@@ -563,9 +563,9 @@ bool EV_FloorCrushStop (int tag)
 }
 
 // same as above but stops any floor mover that was active on the given sector.
-bool EV_StopFloor(int tag)
+bool EV_StopFloor(int tag, line_t *line)
 {
-	FSectorTagIterator it(tag);
+	FSectorTagIterator it(tag, line);
 	while (int sec = it.Next())
 	{
 		if (level.sectors[sec].floordata)
diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp
index 12a29dd3b..01f4f85ff 100644
--- a/src/p_lnspec.cpp
+++ b/src/p_lnspec.cpp
@@ -417,7 +417,7 @@ FUNC(LS_Floor_LowerByValueTimes8)
 FUNC(LS_Floor_CrushStop)
 // Floor_CrushStop (tag)
 {
-	return EV_FloorCrushStop (arg0);
+	return EV_FloorCrushStop (arg0, ln);
 }
 
 FUNC(LS_Floor_LowerInstant)
@@ -571,7 +571,7 @@ FUNC(LS_Generic_Floor)
 FUNC(LS_Floor_Stop)
 // Floor_Stop (tag)
 {
-	return EV_StopFloor(arg0);
+	return EV_StopFloor(arg0, ln);
 }
 
 
@@ -882,7 +882,7 @@ FUNC(LS_Ceiling_LowerByTexture)
 FUNC(LS_Ceiling_Stop)
 // Ceiling_Stop (tag)
 {
-	return EV_StopCeiling(arg0);
+	return EV_StopCeiling(arg0, ln);
 }
 
 
diff --git a/src/p_spec.h b/src/p_spec.h
index 5c8130a53..cd3107c4f 100644
--- a/src/p_spec.h
+++ b/src/p_spec.h
@@ -452,7 +452,7 @@ bool P_CreateCeiling(sector_t *sec, DCeiling::ECeiling type, line_t *line, int t
 bool EV_DoCeiling (DCeiling::ECeiling type, line_t *line, int tag, double speed, double speed2, double height, int crush, int silent, int change, DCeiling::ECrushMode hexencrush = DCeiling::ECrushMode::crushDoom);
 
 bool EV_CeilingCrushStop (int tag, bool remove);
-bool EV_StopCeiling(int tag);
+bool EV_StopCeiling(int tag, line_t *line);
 void P_ActivateInStasisCeiling (int tag);
 
 
@@ -550,7 +550,6 @@ public:
 		int usespecials);
 	friend bool EV_DoFloor (DFloor::EFloor floortype, line_t *line, int tag,
 		double speed, double height, int crush, int change, bool hexencrush, bool hereticlower);
-	friend bool EV_FloorCrushStop (int tag);
 	friend bool EV_DoDonut (int tag, line_t *line, double pillarspeed, double slimespeed);
 private:
 	DFloor ();
@@ -565,8 +564,8 @@ bool EV_BuildStairs (int tag, DFloor::EStair type, line_t *line,
 bool EV_DoFloor(DFloor::EFloor floortype, line_t *line, int tag,
 	double speed, double height, int crush, int change, bool hexencrush, bool hereticlower = false);
 
-bool EV_FloorCrushStop (int tag);
-bool EV_StopFloor(int tag);
+bool EV_FloorCrushStop (int tag, line_t *line);
+bool EV_StopFloor(int tag, line_t *line);
 bool EV_DoDonut (int tag, line_t *line, double pillarspeed, double slimespeed);
 
 class DElevator : public DMover