diff --git a/src/p_setup.c b/src/p_setup.c
index 92f054eb6..6a1c5c049 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -5500,6 +5500,10 @@ static void P_ConvertBinaryLinedefTypes(void)
 			if (lines[i].flags & ML_SKEWTD)
 				lines[i].args[3] |= TMPF_GHOSTFADE;
 			break;
+		case 499: //Ring Racers - Toggle waypoints
+			lines[i].args[0] = tag;
+			lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB);
+			break;
 		case 500: //Scroll front wall left
 		case 501: //Scroll front wall right
 			lines[i].args[0] = 0;
diff --git a/src/p_spec.c b/src/p_spec.c
index 07ec1f102..4abe9f5e1 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -3719,7 +3719,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 					{
 						if (thing->type == MT_WAYPOINT)
 						{
-							if (line->flags & ML_NOCLIMB)
+							if (line->args[1])
 							{
 								thing->extravalue1 = 1;
 							}