diff --git a/java/src/com/tightvnc/rfbplayer/FbsInputStream.java b/java/src/com/tightvnc/rfbplayer/FbsInputStream.java
index 48c5b41..f35219d 100644
--- a/java/src/com/tightvnc/rfbplayer/FbsInputStream.java
+++ b/java/src/com/tightvnc/rfbplayer/FbsInputStream.java
@@ -27,8 +27,8 @@
 
   protected InputStream in;
   protected long startTime;
-  protected long pausedTime;
   protected long timeOffset;
+  protected boolean paused;
 
   protected byte[] buffer;
   protected int bufferSize;
@@ -50,8 +50,8 @@
   {
     this.in = in;
     startTime = System.currentTimeMillis();
-    pausedTime = -1;
     timeOffset = 0;
+    paused = false;
 
     byte[] b = new byte[12];
     readFully(b);
@@ -96,8 +96,8 @@
     in.close();
     in = null;
     startTime = -1;
-    pausedTime = -1;
     timeOffset = 0;
+    paused = false;
 
     buffer = null;
     bufferSize = 0;
@@ -124,15 +124,14 @@
 
   public synchronized void pausePlayback()
   {
-    // FIXME: There is no need to remember the time?
-    pausedTime = System.currentTimeMillis();
+    paused = true;
     notify();
   }
 
   public synchronized void resumePlayback()
   {
+    paused = false;
     startTime = System.currentTimeMillis() - timeOffset;
-    pausedTime = -1;
     notify();
   }
 
@@ -184,7 +183,7 @@
 
   private void waitWhilePaused()
   {
-    while (pausedTime >= 0) {
+    while (paused) {
       synchronized(this) {
 	try {
 	  wait();
