diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 2635d5f0a6..d68bbb3d78 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -796,7 +796,7 @@ void Song::TidyUpData()
 			{
 				Steps* pSteps = vSteps[k];
 			
-				Difficulty dc2 = (Difficulty)(dc+1);
+				Difficulty dc2 = min( (Difficulty)(dc+1), DIFFICULTY_CHALLENGE );
 				pSteps->SetDifficulty( dc2 );
 			}
 		}