diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index f9a5910ac9..a931a5cc86 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -548,12 +548,8 @@ void NoteField::DrawPrimitives()
 				continue;	// don't draw anything
 
 			// If no part of this HoldNote is on the screen, skip it
-			if( !( iFirstIndexToDraw <= hn.iEndRow && hn.iEndRow <= iLastIndexToDraw  ||
-				iFirstIndexToDraw <= hn.iStartRow  && hn.iStartRow <= iLastIndexToDraw  ||
-				hn.iStartRow < iFirstIndexToDraw   && hn.iEndRow > iLastIndexToDraw ) )
-			{
+			if( !hn.RangeOverlaps(iFirstIndexToDraw, iLastIndexToDraw) )
 				continue;	// skip
-			}
 
 			// TRICKY: If boomerang is on, then all notes in the range 
 			// [iFirstIndexToDraw,iLastIndexToDraw] aren't necessarily visible.