diff --git a/src/TimingData.h b/src/TimingData.h
index 655a9087fb..6e9dec85b1 100644
--- a/src/TimingData.h
+++ b/src/TimingData.h
@@ -328,8 +328,8 @@ struct WarpSegment
 	 * @param s the starting row of this segment.
 	 * @param r the row to warp to.
 	 */
-	WarpSegment( int s, int r ): m_iStartRow(max(0, s)),
-		m_fWarpBeats(max(0, NoteRowToBeat(r))) {}
+	WarpSegment( int s, int r ): m_iStartRow(max(0, (s < r ? s : r)),
+		 m_fWarpBeats(max(0, NoteRowToBeat((r > s ? r : s)))) {}
 	/**
 	 * @brief Creates a Warp Segment with the specified starting row and beat to warp to.
 	 * @param s the starting row of this segment.