diff --git a/rfbplayer/rfbSessionReader.h b/rfbplayer/rfbSessionReader.h
index 06941b1..f42a9ee 100644
--- a/rfbplayer/rfbSessionReader.h
+++ b/rfbplayer/rfbSessionReader.h
@@ -32,16 +32,14 @@
   };
   
   ~rfbSessionReader() {
-    fStop = true;
-    delete join();
   }
 
-  void stop() {
+  virtual Thread* join() {
     fStop = true;
+    return Thread::join();
   }
 
-  void rfbSessionReader::run() {
-    fStop = false;
+  virtual void rfbSessionReader::run() {
     // Process the rfb messages
     while (!fStop) {
       try {