diff --git a/src/org/kreed/vanilla/SongTimeline.java b/src/org/kreed/vanilla/SongTimeline.java
index 9447c7bf..7242dec3 100644
--- a/src/org/kreed/vanilla/SongTimeline.java
+++ b/src/org/kreed/vanilla/SongTimeline.java
@@ -413,10 +413,11 @@ public final class SongTimeline {
 	public void purge()
 	{
 		synchronized (this) {
-			while (mCurrentPos > 10 && mRepeatStart > 0) {
+			while (mCurrentPos > 10 && mRepeatStart != 0) {
 				mSongs.remove(0);
 				--mCurrentPos;
-				--mRepeatStart;
+				if (mRepeatStart > 0)
+					--mRepeatStart;
 			}
 		}
 	}