diff --git a/src/org/kreed/vanilla/CoverView.java b/src/org/kreed/vanilla/CoverView.java
index ef935171..5ac462d5 100644
--- a/src/org/kreed/vanilla/CoverView.java
+++ b/src/org/kreed/vanilla/CoverView.java
@@ -422,7 +422,7 @@ public class CoverView extends View {
 				switch (message.what) {
 				case GO:
 					if (message.arg1 == 0)
-						mService.togglePlayback();
+						mService.toggleFlag(PlaybackService.FLAG_PLAYING);
 					else
 						shiftCover(message.arg1);
 					break;
diff --git a/src/org/kreed/vanilla/IPlaybackService.aidl b/src/org/kreed/vanilla/IPlaybackService.aidl
index f129035c..33241d33 100644
--- a/src/org/kreed/vanilla/IPlaybackService.aidl
+++ b/src/org/kreed/vanilla/IPlaybackService.aidl
@@ -29,6 +29,6 @@ interface IPlaybackService {
 	int getDuration();
 
 	void setCurrentSong(int delta);
-	void togglePlayback();
+	void toggleFlag(int flag);
 	void seekToProgress(int progress);
 }
\ No newline at end of file
diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index 530db01e..115c6e2b 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -107,9 +107,9 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 			PlaybackService.this.setCurrentSong(delta);
 		}
 
-		public void togglePlayback()
+		public void toggleFlag(int flag)
 		{
-			PlaybackService.this.togglePlayback();
+			PlaybackService.this.toggleFlag(flag);
 		}
 
 		public void seekToProgress(int progress)
@@ -536,13 +536,13 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 		return (mAudioManager.getRouting(mAudioManager.getMode()) & AudioManager.ROUTE_SPEAKER) != 0;
 	}
 
-	private void togglePlayback()
+	private void toggleFlag(int flag)
 	{
 		synchronized (mStateLock) {
-			if ((mState & FLAG_PLAYING) == 0)
-				setFlag(FLAG_PLAYING);
+			if ((mState & flag) == 0)
+				setFlag(flag);
 			else
-				unsetFlag(FLAG_PLAYING);
+				unsetFlag(flag);
 		}
 	}
 
@@ -722,7 +722,7 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 				break;
 			case GO:
 				if (message.arg1 == 0)
-					togglePlayback();
+					toggleFlag(FLAG_PLAYING);
 				else
 					setCurrentSong(message.arg1);
 				break;