diff --git a/src/p_ceilng.c b/src/p_ceilng.c
index 250d75692..859013078 100644
--- a/src/p_ceilng.c
+++ b/src/p_ceilng.c
@@ -350,7 +350,7 @@ INT32 EV_DoCeilingOLD(mtag_t tag, line_t *line, ceiling_e type)
 
 			//  Linedef executor excellence
 			case moveCeilingByFrontSector:
-				ceiling->speed = line->args[2] << (FRACBITS - 3);
+				ceiling->speed = line->args[3] << (FRACBITS - 3);
 				if (line->frontsector->ceilingheight >= sec->ceilingheight) // Move up
 				{
 					ceiling->direction = 1;
@@ -371,11 +371,11 @@ INT32 EV_DoCeilingOLD(mtag_t tag, line_t *line, ceiling_e type)
 				// chained linedef executing ability
 				// only set it on ONE of the moving sectors (the smallest numbered)
 				// and front side x offset must be positive
-				if (line->args[4])
+				if (line->args[5])
 				{
 					ceiling->texture = firstone ? line->args[4] - 32769 : -1;
 				}
-				else if (line->args[3]) // flat changing ability
+				else if (line->args[4]) // flat changing ability
 					ceiling->texture = line->frontsector->ceilingpic;
 				else
 					ceiling->texture = -1;
diff --git a/src/p_floor.c b/src/p_floor.c
index cbd3bfded..c784ed935 100644
--- a/src/p_floor.c
+++ b/src/p_floor.c
@@ -1725,7 +1725,7 @@ void EV_DoFloorOLD(mtag_t tag, line_t *line, floor_e floortype)
 				break;
 
 			case moveFloorByFrontSector:
-				dofloor->speed = line->args[2] << (FRACBITS - 3);
+				dofloor->speed = line->args[3] << (FRACBITS - 3);
 				dofloor->floordestheight = line->frontsector->floorheight;
 
 				if (dofloor->floordestheight >= sec->floorheight)
@@ -1735,11 +1735,11 @@ void EV_DoFloorOLD(mtag_t tag, line_t *line, floor_e floortype)
 
 				// chained linedef executing ability
 				// Only set it on one of the moving sectors (the smallest numbered)
-				if (line->args[3])
+				if (line->args[4])
 					dofloor->tag = firstone ? (INT16)line->args[3] : -1;
 
 				// flat changing ability
-				dofloor->texture = line->args[4] ? line->frontsector->floorpic : -1;
+				dofloor->texture = line->args[5] ? line->frontsector->floorpic : -1;
 				break;
 
 			case moveFloorByDistance: