diff --git a/src/Player.cpp b/src/Player.cpp
index 8638d33cff..cf8aacbccf 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -2965,12 +2965,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
 		if( iCheckpointFrequencyRows > 0 )
 		{
 			// "the first row after the start of the range that lands on a beat"
-			int iFirstCheckpointInRange = QuantizeUp(m_iFirstUncrossedRow,
-													 iCheckpointFrequencyRows);
+			int iFirstCheckpointInRange = ((m_iFirstUncrossedRow+iCheckpointFrequencyRows-1)
+				/iCheckpointFrequencyRows) * iCheckpointFrequencyRows;
 
 			// "the last row or first row earlier that lands on a beat"
-			int iLastCheckpointInRange = QuantizeDown(iLastRowCrossed,
-													  iCheckpointFrequencyRows);
+			int iLastCheckpointInRange = ((iLastRowCrossed)/iCheckpointFrequencyRows)
+				* iCheckpointFrequencyRows;
 
 			for( int r = iFirstCheckpointInRange; r <= iLastCheckpointInRange; r += iCheckpointFrequencyRows )
 			{
@@ -2992,12 +2992,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
 					int iTrack = nIter.Track();
 
 					// "the first row after the hold head that lands on a beat"
-					int iFirstCheckpointOfHold = QuantizeUp(iStartRow,
-															iCheckpointFrequencyRows);
+					int iFirstCheckpointOfHold = ((iStartRow+iCheckpointFrequencyRows)/iCheckpointFrequencyRows)
+						* iCheckpointFrequencyRows;
 
 					// "the end row or the first earlier row that lands on a beat"
-					int iLastCheckpointOfHold = QuantizeDown(iEndRow,
-															 iCheckpointFrequencyRows);
+					int iLastCheckpointOfHold = ((iEndRow)/iCheckpointFrequencyRows)
+						* iCheckpointFrequencyRows;
 
 					// count the end of the hold as a checkpoint
 					bool bHoldOverlapsRow = iFirstCheckpointOfHold <= r  &&   r <= iLastCheckpointOfHold;