diff --git a/src/NoteField.cpp b/src/NoteField.cpp
index 1ad62d255b..2f136a7794 100644
--- a/src/NoteField.cpp
+++ b/src/NoteField.cpp
@@ -879,7 +879,7 @@ void NoteField::DrawPrimitives()
 			{
 				float fBeat = NoteRowToBeat(seg->m_iStartRow);
 				if( IS_ON_SCREEN(fBeat) )
-					DrawWarpText( fBeat, seg->m_fEndBeat );
+					DrawWarpText( fBeat, seg->m_fLengthBeats );
 			}
 		}
 
diff --git a/src/NotesWriterSSC.cpp b/src/NotesWriterSSC.cpp
index 3f01843b06..fcc88c39ba 100644
--- a/src/NotesWriterSSC.cpp
+++ b/src/NotesWriterSSC.cpp
@@ -112,7 +112,7 @@ static void GetTimingTags( vector<RString> &lines, TimingData timing, bool bIsSo
 	{
 		w.Init( "WARPS" );
 		FOREACH_CONST( WarpSegment, timing.m_WarpSegments, ws )
-			w.Write( ws->m_iStartRow, ws->m_fEndBeat );
+			w.Write( ws->m_iStartRow, ws->m_fLengthBeats );
 		w.Finish();
 	}
 	
@@ -143,7 +143,7 @@ static void GetTimingTags( vector<RString> &lines, TimingData timing, bool bIsSo
 		
 		w.Init( "FAKES" );
 		FOREACH_CONST( FakeSegment, timing.m_FakeSegments, fs )
-			w.Write( fs->m_iStartRow, fs->m_fEndBeat );
+			w.Write( fs->m_iStartRow, fs->m_fLengthBeats );
 		w.Finish();
 	}