diff --git a/src/NotesLoaderSM.cpp b/src/NotesLoaderSM.cpp
index ec846aa2cc..1485f288d5 100644
--- a/src/NotesLoaderSM.cpp
+++ b/src/NotesLoaderSM.cpp
@@ -225,7 +225,7 @@ bool SMLoader::ProcessBPMs( TimingData &out, const RString sParam )
 			if( negBPM < 0 )
 			{
 				float endBeat = fBeat + (fNewBPM / -negBPM) * (fBeat - negBeat);
-				WarpSegment new_seg(negBeat, endBeat);
+				WarpSegment new_seg(negBeat, endBeat - negBeat);
 				out.AddWarpSegment( new_seg );
 				
 				negBeat = -1;
@@ -241,7 +241,7 @@ bool SMLoader::ProcessBPMs( TimingData &out, const RString sParam )
 				// add in a warp.
 				if( highspeedBeat > 0 )
 				{
-					WarpSegment new_seg(highspeedBeat, fBeat);
+					WarpSegment new_seg(highspeedBeat, fBeat - highspeedBeat);
 					out.AddWarpSegment( new_seg );
 					highspeedBeat = -1;
 				}
@@ -317,7 +317,7 @@ void SMLoader::ProcessStops( TimingData &out, const RString sParam )
 		float fSecondsPerBeat = 60 / oldBPM.GetBPM();
 		float fSkipBeats = negPause / fSecondsPerBeat;
 		
-		WarpSegment ws( negBeat, negBeat + fSkipBeats);
+		WarpSegment ws( negBeat, fSkipBeats);
 		out.AddWarpSegment( ws );
 	}
 }
diff --git a/src/Song.cpp b/src/Song.cpp
index 7f40c89a51..fe1ec70663 100644
--- a/src/Song.cpp
+++ b/src/Song.cpp
@@ -41,7 +41,7 @@
  * @brief The internal version of the cache for StepMania.
  *
  * Increment this value to invalidate the current cache. */
-const int FILE_CACHE_VERSION = 175;
+const int FILE_CACHE_VERSION = 176;
 
 /** @brief How long does a song sample last by default? */
 const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;