diff --git a/x0vncserver/x0vncserver.cxx b/x0vncserver/x0vncserver.cxx
index 336350d..4ee44e0 100644
--- a/x0vncserver/x0vncserver.cxx
+++ b/x0vncserver/x0vncserver.cxx
@@ -200,12 +200,13 @@
   virtual void stop() {
     running = false;
 
-    // FIXME: Delete images as well?!
     delete pb;
     delete pollmgr;
+    delete image;
 
     pb = 0;
     pollmgr = 0;
+    image = 0;
   }
 
   inline bool isRunning() {