diff --git a/docs/TODO b/docs/TODO
index 882213cc..c2bda7ff 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,14 +1,16 @@
 Short Term:
 
+- Timing delta between frames in proxy record log, for playback
+  support (for demo and test).
+
+- Playback/demo on website.
+
 - Test on IE 9 preview 3.
 
 - Possibly support IE <= 8.0 using excanvas or fxcanvas:
   http://excanvas.sourceforge.net/
   http://code.google.com/p/fxcanvas/
 
-- Timing delta between frames in proxy record log, for playback
-  support (for demo and test).
-
 
 Medium Term:
 
diff --git a/include/vnc.js b/include/vnc.js
index d4b651ad..d9739a11 100644
--- a/include/vnc.js
+++ b/include/vnc.js
@@ -40,6 +40,8 @@ function get_VNC_uri_prefix() {
         VNC_native_ws = true;
     } else {
         VNC_native_ws = false;
+        WebSocket__swfLocation = get_VNC_uri_prefix() +
+                    "web-socket-js/WebSocketMain.swf";
         extra += start + "web-socket-js/swfobject.js" + end;
         extra += start + "web-socket-js/FABridge.js" + end;
         extra += start + "web-socket-js/web_socket.js" + end;
@@ -132,9 +134,6 @@ load: function () {
             RFB.updateState('failed',
                     "'file://' URL is incompatible with Adobe Flash");
         } else {
-            WebSocket.__swfLocation = get_VNC_uri_prefix() +
-                        "web-socket-js/WebSocketMain.swf";
-            WebSocket.__initialize();
             RFB.updateState('disconnected', 'Disconnected');
         }
     }