diff --git a/src/p_mobj.c b/src/p_mobj.c
index e2f6ac492..0feba0409 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11324,8 +11324,8 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 		const fixed_t mobjscale =
 			mapheaderinfo[gamemap-1]->default_waypoint_radius;
 
-		if (mthing->args[0] > 0)
-			mobj->radius = (mthing->args[0]) * FRACUNIT;
+		if (mthing->args[1] > 0)
+			mobj->radius = (mthing->args[1]) * FRACUNIT;
 		else if (mobjscale > 0)
 			mobj->radius = mobjscale;
 		else
@@ -11337,7 +11337,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 		// lastlook is used for indicating the waypoint is a shortcut
 		// extravalue1 is used for indicating the waypoint is disabled
 		// extravalue2 is used for indicating the waypoint is the finishline
-		mobj->threshold = mthing->angle;
+		mobj->threshold = mthing->args[0];
 		mobj->movecount = mthing->tag;
 		if (mthing->options & MTF_EXTRA)
 		{
@@ -11363,7 +11363,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 		{
 			mobj->reactiontime = 1;
 		}
-		if (mthing->args[1] == 1)
+		if (mthing->args[2] == 1)
 		{
 			mobj->extravalue2 = 1; // args[1] of 1 means the waypoint is at the finish line
 		}
diff --git a/src/p_setup.c b/src/p_setup.c
index 4d7a34857..57ddc1be6 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3162,8 +3162,8 @@ static void P_ConvertBinaryMap(void)
 			INT32 firstline = P_FindSpecialLineFromTag(2000, mapthings[i].angle, -1);
 
 			mapthings[i].tag = mapthings[i].angle;
-			mapthings[i].angle = mapthings[i].z;
-			mapthings[i].args[1] = mapthings[i].extrainfo;
+			mapthings[i].args[0] = mapthings[i].z;
+			mapthings[i].args[2] = mapthings[i].extrainfo;
 			mapthings[i].z = 0;
 
 			if (firstline != -1)
@@ -3172,7 +3172,7 @@ static void P_ConvertBinaryMap(void)
 				fixed_t linez = sides[lines[firstline].sidenum[0]].rowoffset;
 
 				if (lineradius > 0)
-					mapthings[i].args[0] = lineradius / FRACUNIT;
+					mapthings[i].args[1] = lineradius / FRACUNIT;
 
 				mapthings[i].z = linez / FRACUNIT;
 			}